[llvm-commits] [llvm] r70973 - in /llvm/trunk: test/LLVMC/EnvParentheses.td utils/TableGen/LLVMCConfigurationEmitter.cpp

[Mikhail Glushenkov]

Author: foldr
Date: Tue May  5 07:34:34 2009
New Revision: 70973

URL: http://llvm.org/viewvc/llvm-project?rev=70973&view=rev
Log:
Fix incorrect code generation with ENV.

See PR4157 for details. Patch by Martin Nowack!

Added:
    llvm/trunk/test/LLVMC/EnvParentheses.td
Modified:
    llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

Added: llvm/trunk/test/LLVMC/EnvParentheses.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/EnvParentheses.td?rev=70973&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/EnvParentheses.td (added)
+++ llvm/trunk/test/LLVMC/EnvParentheses.td Tue May  5 07:34:34 2009
@@ -0,0 +1,16 @@
+// Check the fix for PR4157.
+// http://llvm.org/bugs/show_bug.cgi?id=4157
+// RUN: tblgen -I $srcroot/include --gen-llvmc %s -o %t
+// RUN: not grep {)));} %t
+
+include "llvm/CompilerDriver/Common.td"
+
+def dummy_tool : Tool<[
+(cmd_line "gcc -o $OUTFILE $INFILE $ENV(FOO)/bar"),
+(in_language "dummy"),
+(out_language "dummy")
+]>;
+
+def DummyGraph : CompilationGraph<[SimpleEdge<"root", "dummy_tool">]>;
+
+def Graph : CompilationGraph<[]>;

Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=70973&r1=70972&r2=70973&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Tue May  5 07:34:34 2009
@@ -1265,7 +1265,6 @@
   assert(Leftover.at(0) == ')');
   if (Leftover.size() != 1)
     O << " + std::string(\"" << (Leftover.c_str() + 1) << "\")";
-  O << ')';
 
   return Pos;
 }