diff options
| -rw-r--r-- | lib/Analysis/ValueTracking.cpp | 3 | ||||
| -rw-r--r-- | tools/llvm-stub/llvm-stub.c | 15 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lib/Analysis/ValueTracking.cpp b/lib/Analysis/ValueTracking.cpp index 7b87cb62da..32a77e6f46 100644 --- a/lib/Analysis/ValueTracking.cpp +++ b/lib/Analysis/ValueTracking.cpp @@ -871,7 +871,7 @@ Value *llvm::FindInsertedValue(Value *V, const unsigned *idx_begin, const unsigned *req_idx = idx_begin; for (const unsigned *i = I->idx_begin(), *e = I->idx_end(); i != e; ++i, ++req_idx) { - if (req_idx == idx_end) + if (req_idx == idx_end) { if (InsertBefore) // The requested index identifies a part of a nested aggregate. Handle // this specially. For example, @@ -887,6 +887,7 @@ Value *llvm::FindInsertedValue(Value *V, const unsigned *idx_begin, else // We can't handle this without inserting insertvalues return 0; + } // This insert value inserts something else than what we are looking for. // See if the (aggregrate) value inserted into has the value we are diff --git a/tools/llvm-stub/llvm-stub.c b/tools/llvm-stub/llvm-stub.c index 91537a0b9c..18d20e7d0c 100644 --- a/tools/llvm-stub/llvm-stub.c +++ b/tools/llvm-stub/llvm-stub.c @@ -38,7 +38,6 @@ int main(int argc, char** argv) { const char *Interp = getenv("LLVMINTERP"); const char **Args; - int len; if (Interp == 0) Interp = "lli"; /* Set up the command line options to pass to the JIT. */ @@ -47,12 +46,14 @@ int main(int argc, char** argv) { Args[0] = Interp; #ifdef LLVM_ON_WIN32 - len = strlen(argv[0]); - if (len < 4 || strcmp(argv[0] + len - 4, ".exe") != 0) { - /* .exe suffix is stripped off of argv[0] if the executable was run on the - * command line without one. Put it back on. - */ - argv[0] = strcat(strcpy((char*)malloc(len + 5), argv[0]), ".exe"); + { + int len = strlen(argv[0]); + if (len < 4 || strcmp(argv[0] + len - 4, ".exe") != 0) { + /* .exe suffix is stripped off of argv[0] if the executable was run on the + * command line without one. Put it back on. + */ + argv[0] = strcat(strcpy((char*)malloc(len + 5), argv[0]), ".exe"); + } } #endif |