Remove DEBUG_DECLARE, looks like we don't need it.
Also, DEBUG_VALUE has side effects.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@93498 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/Target/Target.td b/include/llvm/Target/Target.td
index 740bf4f..206e42e 100644
--- a/include/llvm/Target/Target.td
+++ b/include/llvm/Target/Target.td
@@ -482,15 +482,6 @@
let InOperandList = (ops unknown:$value, i64imm:$offset, unknown:$meta);
let AsmString = "DEBUG_VALUE";
let Namespace = "TargetInstrInfo";
- let neverHasSideEffects = 1;
- let isAsCheapAsAMove = 1;
-}
-def DEBUG_DECLARE : Instruction {
- let OutOperandList = (ops);
- let InOperandList = (ops unknown:$vbl, unknown:$meta);
- let AsmString = "DEBUG_DECLARE";
- let Namespace = "TargetInstrInfo";
- let neverHasSideEffects = 1;
let isAsCheapAsAMove = 1;
}
}
diff --git a/include/llvm/Target/TargetInstrInfo.h b/include/llvm/Target/TargetInstrInfo.h
index e6df1bf..8e2157e 100644
--- a/include/llvm/Target/TargetInstrInfo.h
+++ b/include/llvm/Target/TargetInstrInfo.h
@@ -91,10 +91,7 @@
COPY_TO_REGCLASS = 10,
// DEBUG_VALUE - a mapping of the llvm.dbg.value intrinsic
- DEBUG_VALUE = 11,
-
- // DEBUG_DECLARE - a mapping of the llvm.dbg.declare intrinsic
- DEBUG_DECLARE = 12
+ DEBUG_VALUE = 11
};
unsigned getNumOpcodes() const { return NumOpcodes; }
diff --git a/utils/TableGen/CodeEmitterGen.cpp b/utils/TableGen/CodeEmitterGen.cpp
index 23d42de..714a39c 100644
--- a/utils/TableGen/CodeEmitterGen.cpp
+++ b/utils/TableGen/CodeEmitterGen.cpp
@@ -35,8 +35,7 @@
R->getName() == "IMPLICIT_DEF" ||
R->getName() == "SUBREG_TO_REG" ||
R->getName() == "COPY_TO_REGCLASS" ||
- R->getName() == "DEBUG_VALUE" ||
- R->getName() == "DEBUG_DECLARE") continue;
+ R->getName() == "DEBUG_VALUE") continue;
BitsInit *BI = R->getValueAsBitsInit("Inst");
@@ -114,8 +113,7 @@
R->getName() == "IMPLICIT_DEF" ||
R->getName() == "SUBREG_TO_REG" ||
R->getName() == "COPY_TO_REGCLASS" ||
- R->getName() == "DEBUG_VALUE" ||
- R->getName() == "DEBUG_DECLARE") {
+ R->getName() == "DEBUG_VALUE") {
o << " 0U,\n";
continue;
}
@@ -154,8 +152,7 @@
InstName == "IMPLICIT_DEF" ||
InstName == "SUBREG_TO_REG" ||
InstName == "COPY_TO_REGCLASS" ||
- InstName == "DEBUG_VALUE" ||
- InstName == "DEBUG_DECLARE") continue;
+ InstName == "DEBUG_VALUE") continue;
BitsInit *BI = R->getValueAsBitsInit("Inst");
const std::vector<RecordVal> &Vals = R->getValues();
diff --git a/utils/TableGen/CodeGenTarget.cpp b/utils/TableGen/CodeGenTarget.cpp
index 572a9a8..c9af5f7 100644
--- a/utils/TableGen/CodeGenTarget.cpp
+++ b/utils/TableGen/CodeGenTarget.cpp
@@ -342,11 +342,6 @@
throw "Could not find 'DEBUG_VALUE' instruction!";
const CodeGenInstruction *DEBUG_VALUE = &I->second;
- I = getInstructions().find("DEBUG_DECLARE");
- if (I == Instructions.end())
- throw "Could not find 'DEBUG_DECLARE' instruction!";
- const CodeGenInstruction *DEBUG_DECLARE = &I->second;
-
// Print out the rest of the instructions now.
NumberedInstructions.push_back(PHI);
NumberedInstructions.push_back(INLINEASM);
@@ -360,7 +355,6 @@
NumberedInstructions.push_back(SUBREG_TO_REG);
NumberedInstructions.push_back(COPY_TO_REGCLASS);
NumberedInstructions.push_back(DEBUG_VALUE);
- NumberedInstructions.push_back(DEBUG_DECLARE);
for (inst_iterator II = inst_begin(), E = inst_end(); II != E; ++II)
if (&II->second != PHI &&
&II->second != INLINEASM &&
@@ -373,8 +367,7 @@
&II->second != IMPLICIT_DEF &&
&II->second != SUBREG_TO_REG &&
&II->second != COPY_TO_REGCLASS &&
- &II->second != DEBUG_VALUE &&
- &II->second != DEBUG_DECLARE)
+ &II->second != DEBUG_VALUE)
NumberedInstructions.push_back(&II->second);
}
diff --git a/utils/TableGen/InstrInfoEmitter.cpp b/utils/TableGen/InstrInfoEmitter.cpp
index 92d7048..cf40c78 100644
--- a/utils/TableGen/InstrInfoEmitter.cpp
+++ b/utils/TableGen/InstrInfoEmitter.cpp
@@ -346,8 +346,7 @@
R->getName() != "IMPLICIT_DEF" &&
R->getName() != "SUBREG_TO_REG" &&
R->getName() != "COPY_TO_REGCLASS" &&
- R->getName() != "DEBUG_VALUE" &&
- R->getName() != "DEBUG_DECLARE")
+ R->getName() != "DEBUG_VALUE")
throw R->getName() + " doesn't have a field named '" +
Val->getValue() + "'!";
return;