commit dc77b2e960b6b6d4622c89ee8d324848ac6a0609
author Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> Mon Apr 17 17:41:25 2017 +0000
committer Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> Mon Apr 17 17:41:25 2017 +0000
tree ee95d74103b85edb140f01e71dba89d2138bb087
parent 879a0b2e1b9a2a15db03c01a4e265e1ea401e5e6

Distinguish between code pointer size and DataLayout::getPointerSize() in DWARF info generation

llvm-svn: 300463

llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 6c18d56..5d099be 100644
--- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -1356,7 +1356,7 @@
         OutContext.getOrCreateSymbol(StringRef("__morestack_addr"));
     OutStreamer->EmitLabel(AddrSymbol);
 
-    unsigned PtrSize = M.getDataLayout().getPointerSize(0);
+    unsigned PtrSize = MAI->getCodePointerSize();
     OutStreamer->EmitSymbolValue(GetExternalSymbolSymbol("__morestack"),
                                  PtrSize);
   }
@@ -2781,7 +2781,7 @@
   // before the function's end, we assume that this is happening after
   // the last return instruction.
 
-  auto WordSizeBytes = TM.getPointerSize();
+  auto WordSizeBytes = MAI->getCodePointerSize();
   MCSymbol *Tmp = OutContext.createTempSymbol("xray_synthetic_", true);
   OutStreamer->EmitCodeAlignment(16);
   OutStreamer->EmitSymbolValue(Tmp, WordSizeBytes, false);