One last pass of DataLayout variable renaming.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201834 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index 7a56bff50e2b04f89004f626da6a7fdf98d2fe84..435d4e22b7841b10a6452d905ae68dcd5c027aa8 100644 (file)
--- a/tools/llc/llc.cpp
+++ b/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/tools/opt/opt.cpp b/tools/opt/opt.cpp
index 4d501733c0aace59e065752e9fdfd0acfe585721..fa9bc678c3503c9c94b709dacef3ee9eecb2e648 100644 (file)
--- a/tools/opt/opt.cpp
+++ b/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);