don't try to legalize llvm.dbg.declare, and ignore it later

2 files changed, 16 insertions, 0 deletions

diff --git a/lib/Target/CppBackend/CallHandlers.h b/lib/Target/CppBackend/CallHandlers.h
index 1fdab44b88..e662035a13 100644
--- a/lib/Target/CppBackend/CallHandlers.h
+++ b/lib/Target/CppBackend/CallHandlers.h
@@ -706,6 +706,7 @@ std::string handleCall(const CallInst *CI) {
   const Value *CV = CI->getCalledValue();
   assert(!isa<InlineAsm>(CV) && "asm() not supported, use EM_ASM() (see emscripten.h)");
   std::string Name = getCppName(CV);
+  if (strcmp(Name.c_str(), "_llvm_dbg_value") == 0) return ""; // ignore this
   unsigned NumArgs = CI->getNumArgOperands();
   CallHandlerMap::iterator CH = CallHandlers->find("___default__");
   if (isa<Function>(CV)) {
diff --git a/lib/Transforms/NaCl/ExpandI64.cpp b/lib/Transforms/NaCl/ExpandI64.cpp
index 1dd8775903..271c534686 100644
--- a/lib/Transforms/NaCl/ExpandI64.cpp
+++ b/lib/Transforms/NaCl/ExpandI64.cpp
@@ -150,7 +150,15 @@ static FunctionType *getLegalizedFunctionType(FunctionType *FT) {
 
 // Implementation of ExpandI64
 
+bool okToRemainIllegal(Function *F) {
+  const char *Name = F->getName().str().c_str();
+  if (strcmp(Name, "llvm.dbg.value") == 0) return true;
+  return false;
+}
+
 void ExpandI64::ensureLegalFunc(Function *F) {
+  if (okToRemainIllegal(F)) return;
+
   FunctionType *FT = F->getFunctionType();
   int Num = FT->getNumParams();
   for (int i = -1; i < Num; i++) {
@@ -189,6 +197,8 @@ void ExpandI64::ensureLegalFunc(Function *F) {
 }
 
 void ExpandI64::removeIllegalFunc(Function *F) {
+  if (okToRemainIllegal(F)) return;
+
   FunctionType *FT = F->getFunctionType();
   int Num = FT->getNumParams();
   for (int i = -1; i < Num; i++) {
@@ -425,6 +435,11 @@ void ExpandI64::splitInst(Instruction *I, DataLayout& DL) {
     }
     case Instruction::Call: {
       CallInst *CI = dyn_cast<CallInst>(I);
+      Function *F = CI->getCalledFunction();
+      if (F) {
+        assert(okToRemainIllegal(F));
+        break;
+      }
       Value *CV = CI->getCalledValue();
       FunctionType *OFT = NULL;
       if (ConstantExpr *CE = dyn_cast<ConstantExpr>(CV)) {