diff options
| -rw-r--r-- | llvm/tools/llc/llc.cpp | 4 | ||||
| -rw-r--r-- | llvm/tools/opt/opt.cpp | 14 | 
2 files changed, 9 insertions, 9 deletions
diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp index 7a56bff50e2..435d4e22b78 100644 --- a/llvm/tools/llc/llc.cpp +++ b/llvm/tools/llc/llc.cpp @@ -293,8 +293,8 @@ static int compileModule(char **argv, LLVMContext &Context) {    PM.add(TLI);    // Add the target data from the target machine, if it exists, or the module. -  if (const DataLayout *TD = Target.getDataLayout()) -    PM.add(new DataLayout(*TD)); +  if (const DataLayout *DL = Target.getDataLayout()) +    PM.add(new DataLayout(*DL));    else      PM.add(new DataLayout(mod)); diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp index 4d501733c0a..fa9bc678c35 100644 --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -425,15 +425,15 @@ int main(int argc, char **argv) {    Passes.add(TLI);    // Add an appropriate DataLayout instance for this module. -  DataLayout *TD = 0; +  DataLayout *DL = 0;    const std::string &ModuleDataLayout = M.get()->getDataLayout();    if (!ModuleDataLayout.empty()) -    TD = new DataLayout(ModuleDataLayout); +    DL = new DataLayout(ModuleDataLayout);    else if (!DefaultDataLayout.empty()) -    TD = new DataLayout(DefaultDataLayout); +    DL = new DataLayout(DefaultDataLayout); -  if (TD) -    Passes.add(TD); +  if (DL) +    Passes.add(DL);    Triple ModuleTriple(M->getTargetTriple());    TargetMachine *Machine = 0; @@ -448,8 +448,8 @@ int main(int argc, char **argv) {    OwningPtr<FunctionPassManager> FPasses;    if (OptLevelO1 || OptLevelO2 || OptLevelOs || OptLevelOz || OptLevelO3) {      FPasses.reset(new FunctionPassManager(M.get())); -    if (TD) -      FPasses->add(new DataLayout(*TD)); +    if (DL) +      FPasses->add(new DataLayout(*DL));      if (TM.get())        TM->addAnalysisPasses(*FPasses);  | 

