From f4a680923112109d09330e2db967bf9583d69906 Mon Sep 17 00:00:00 2001
From: Mikhail Glushenkov <foldr@codedgers.com>
Date: Sat, 23 Oct 2010 07:32:53 +0000
Subject: [PATCH] Remove -llvmc-temp-hack from tblgen.

llvm-svn: 117197
---
 llvm/Makefile.rules                        |  2 +-
 llvm/test/LLVMC/MultipleOutputLanguages.td |  6 +++---
 llvm/test/LLVMC/OptionPreprocessor.td      | 10 +++++-----
 llvm/utils/TableGen/TGParser.cpp           | 18 +-----------------
 4 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules
index d9645b634108..4aa448d1cef8 100644
--- a/llvm/Makefile.rules
+++ b/llvm/Makefile.rules
@@ -1785,7 +1785,7 @@ $(INCTMPFiles) : $(TBLGEN) $(TDFiles)
 
 $(ObjDir)/%.inc.tmp: %.td $(ObjDir)/.dir
 	$(Echo) "Building LLVMC compilation graph description with tblgen"
-	$(Verb) $(TableGen) -gen-llvmc -llvmc-temp-hack -o $(call SYSPATH, $@) $<
+	$(Verb) $(TableGen) -gen-llvmc -o $(call SYSPATH, $@) $<
 
 clean-local::
 	-$(Verb) $(RM) -f $(INCFiles)
diff --git a/llvm/test/LLVMC/MultipleOutputLanguages.td b/llvm/test/LLVMC/MultipleOutputLanguages.td
index 16ce6be85c80..ae0c92eefcf1 100644
--- a/llvm/test/LLVMC/MultipleOutputLanguages.td
+++ b/llvm/test/LLVMC/MultipleOutputLanguages.td
@@ -1,5 +1,5 @@
 // Check that multiple output languages work.
-// RUN: tblgen -I %p/../../include -llvmc-temp-hack --gen-llvmc %s -o %t
+// RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
 // RUN: FileCheck -input-file %t %s
 // RUN: %compile_cxx %t
 // XFAIL: vg_leak
@@ -9,12 +9,12 @@ include "llvm/CompilerDriver/Common.td"
 def dummy_tool : Tool<[
     (command "dummy_cmd"),
     (in_language "dummy_lang"),
-    (out_language ["another_dummy_lang", "yet_another_dummy_lang"])
+    (out_language "another_dummy_lang", "yet_another_dummy_lang")
 ]>;
 
 def another_dummy_tool : Tool<[
     (command "another_dummy_cmd"),
-    (in_language ["another_dummy_lang", "some_other_dummy_lang"]),
+    (in_language "another_dummy_lang", "some_other_dummy_lang"),
     (out_language "executable"),
     (join)
 ]>;
diff --git a/llvm/test/LLVMC/OptionPreprocessor.td b/llvm/test/LLVMC/OptionPreprocessor.td
index 44670cee932f..5fdc35a187eb 100644
--- a/llvm/test/LLVMC/OptionPreprocessor.td
+++ b/llvm/test/LLVMC/OptionPreprocessor.td
@@ -1,5 +1,5 @@
 // Test for the OptionPreprocessor and related functionality.
-// RUN: tblgen -I %p/../../include -llvmc-temp-hack --gen-llvmc %s -o %t
+// RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
 // RUN: FileCheck -input-file %t %s
 // RUN: %compile_cxx %t
 // XFAIL: vg_leak
@@ -22,7 +22,7 @@ def Preprocess : OptionPreprocessor<
       // CHECK: foo = false;
       // CHECK: foo_p = "";
       // CHECK: foo_l.clear();
-      (and (switch_on "foo"), (any_switch_on ["bar", "baz"])),
+      (and (switch_on "foo"), (any_switch_on "bar", "baz")),
            [(warning "W1"), (unset_option "foo"),
                             (unset_option "foo_p"), (unset_option "foo_l")],
       // CHECK: W2
@@ -34,7 +34,7 @@ def Preprocess : OptionPreprocessor<
       // CHECK: foo_l.push_back("qwert");
       // CHECK: foo_l.push_back("yuiop");
       // CHECK: foo_l.push_back("asdf");
-      (and (switch_on ["foo", "bar"]), (any_empty ["foo_p", "bar_p"])),
+      (and (switch_on "foo", "bar"), (any_empty "foo_p", "bar_p")),
            [(warning "W2"), (set_option "foo"),
                             (set_option "bar", true),
                             (set_option "baz", false),
@@ -44,8 +44,8 @@ def Preprocess : OptionPreprocessor<
       // CHECK: foo = true;
       // CHECK: bar = true;
       // CHECK: baz = true;
-      (and (empty ["foo_p", "bar_p"]), (any_not_empty ["baz_p"])),
-           [(warning "W3"), (set_option ["foo", "bar", "baz"])])
+      (and (empty "foo_p", "bar_p"), (any_not_empty "baz_p")),
+           [(warning "W3"), (set_option "foo", "bar", "baz")])
 >;
 
 // Shut up warnings...
diff --git a/llvm/utils/TableGen/TGParser.cpp b/llvm/utils/TableGen/TGParser.cpp
index a666c9140da9..1f4b07b4bdac 100644
--- a/llvm/utils/TableGen/TGParser.cpp
+++ b/llvm/utils/TableGen/TGParser.cpp
@@ -20,11 +20,6 @@
 #include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
-/// LLVMCHack - This is a temporary hack that changes how "(foo [1, 2, 3])"
-/// parses.
-/// FIXME: REMOVE THIS.
-static cl::opt<bool> LLVMCHack("llvmc-temp-hack", cl::ReallyHidden);
-
 //===----------------------------------------------------------------------===//
 // Support Code for the Semantic Actions.
 //===----------------------------------------------------------------------===//
@@ -1219,18 +1214,7 @@ Init *TGParser::ParseSimpleValue(Record *CurRec, RecTy *ItemType) {
       return 0;
     }
 
-    Init *Operator;
-    /// LLVMC Requires an old grammar and I don't know how to update it, placate
-    /// it in the short term by changing the grammar specifically for llvmc.
-    /// FIXME: REMOVE THIS.
-    if (!LLVMCHack)
-      Operator = ParseValue(CurRec);
-    else {
-      if (Lex.getCode() == tgtok::Id)
-        Operator = ParseIDValue(CurRec);
-      else
-        Operator = ParseOperation(CurRec);
-    }
+    Init *Operator = ParseValue(CurRec);
     if (Operator == 0) return 0;
 
     // If the operator name is present, parse it.