replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove -llvmc-temp-hack from tblgen. 

llvm-svn: 117197
This commit is contained in:
Mikhail Glushenkov 2010-10-23 07:32:53 +00:00
parent e9b78186d4
commit f4a6809231
4 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/Makefile.rules
View File

@ -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)

6
llvm/test/LLVMC/MultipleOutputLanguages.td
View File

@ -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)
]>;

10
llvm/test/LLVMC/OptionPreprocessor.td
View File

@ -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...

18
llvm/utils/TableGen/TGParser.cpp
View File

@ -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.