X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FLLVMC%2FOptionPreprocessor.td;h=5fdc35a187ebb4e825e623c9ab2782cbe6083202;hb=3b5dfcd8fd9edce8019b6d7541e2a3c5159b2852;hp=e1e8eff63de19a4485b1279f91b98086866a962c;hpb=eb6ed3f89d096b9c8eadb988a4309387b845ab94;p=oota-llvm.git

diff --git a/test/LLVMC/OptionPreprocessor.td b/test/LLVMC/OptionPreprocessor.td
index e1e8eff63de..5fdc35a187e 100644
--- a/test/LLVMC/OptionPreprocessor.td
+++ b/test/LLVMC/OptionPreprocessor.td
@@ -1,7 +1,7 @@
 // Test for the OptionPreprocessor and related functionality.
 // RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
 // RUN: FileCheck -input-file %t %s
-// RUN: %compile_cxx -x c++ %t
+// RUN: %compile_cxx %t
 // XFAIL: vg_leak
 
 include "llvm/CompilerDriver/Common.td"
@@ -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...
@@ -63,5 +63,5 @@ def dummy : Tool<
                 (not_empty "foo_l"), (error)))
 ]>;
 
-def Graph : CompilationGraph<[Edge<"root", "dummy">]>;
+def Graph : CompilationGraph<[(edge "root", "dummy")]>;