Re-committing the last bit of change. It shouldn't break PPC this time.

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

diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp
index 873b8ade4e2968a4a826fa2ebe2e14dde4db1202..e0d1905488ab4806e8f4915010d7123d811c4c4e 100644 (file)
--- a/utils/TableGen/DAGISelEmitter.cpp
+++ b/utils/TableGen/DAGISelEmitter.cpp
@@ -2137,10 +2137,9 @@ public:
           Code += ", Tmp" + utostr(i + ResNo);
         emitCheck(Code + ")");
 
-        // This breaks ppc
-        //for (unsigned i = 0; i < NumRes; ++i)
-        //  emitCode("Tmp" + utostr(i+ResNo) + " = Select(Tmp" +
-        //           utostr(i+ResNo) + ");");
+        for (unsigned i = 0; i < NumRes; ++i)
+          emitCode("Tmp" + utostr(i+ResNo) + " = Select(Tmp" +
+                   utostr(i+ResNo) + ");");
 
         TmpNo = ResNo + NumRes;
       } else {
@@ -2885,6 +2884,10 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
      << "  case ISD::EntryToken:       // These leaves remain the same.\n"
      << "  case ISD::BasicBlock:\n"
      << "  case ISD::Register:\n"
+     << "  case ISD::TargetConstant:\n"
+     << "  case ISD::TargetConstantPool:\n"
+     << "  case ISD::TargetFrameIndex:\n"
+     << "  case ISD::TargetGlobalAddress:\n"
      << "    return N;\n"
      << "  case ISD::AssertSext:\n"
      << "  case ISD::AssertZext: {\n"