[llvm-commits] [llvm] r71054 - in /llvm/trunk: test/LLVMC/ForwardAs.td tools/llvmc/doc/LLVMC-Reference.rst utils/TableGen/LLVMCConfigurationEmitter.cpp

[Mikhail Glushenkov]

Author: foldr
Date: Tue May  5 20:41:19 2009
New Revision: 71054

URL: http://llvm.org/viewvc/llvm-project?rev=71054&view=rev
Log:
The 'forward_as' property did not use its second argument.

See PR4159 for details. Patch by Martin Nowack!

Added:
    llvm/trunk/test/LLVMC/ForwardAs.td
Modified:
    llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst
    llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

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

==============================================================================
--- llvm/trunk/test/LLVMC/ForwardAs.td (added)
+++ llvm/trunk/test/LLVMC/ForwardAs.td Tue May  5 20:41:19 2009
@@ -0,0 +1,18 @@
+// Check the fix for PR4159.
+// http://llvm.org/bugs/show_bug.cgi?id=4159
+// RUN: tblgen -I $srcroot/include --gen-llvmc %s -o %t
+// RUN: grep unique_name %t
+
+include "llvm/CompilerDriver/Common.td"
+
+def OptList : OptionList<[(parameter_option "dummy", (extern))]>;
+
+def dummy_tool : Tool<[
+(cmd_line "dummy_cmd"),
+(in_language "dummy"),
+(out_language "dummy"),
+(actions (case
+         (not_empty "dummy"), (forward_as "dummy", "unique_name")))
+]>;
+
+def DummyGraph : CompilationGraph<[SimpleEdge<"root", "dummy_tool">]>;

Modified: llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst?rev=71054&r1=71053&r2=71054&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst (original)
+++ llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst Tue May  5 20:41:19 2009
@@ -529,7 +529,7 @@
 
    - ``forward_as`` - Change the name of an option, but forward the
      argument unchanged.
-     Example: ``(forward_as "O0" "--disable-optimization")``.
+     Example: ``(forward_as "O0", "--disable-optimization")``.
 
    - ``output_suffix`` - modify the output suffix of this
      tool.

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

==============================================================================
--- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Tue May  5 20:41:19 2009
@@ -1444,7 +1444,7 @@
     else if (ActionName == "forward_as") {
       checkNumberOfArguments(&Dag, 2);
       const std::string& Name = InitPtrToString(Dag.getArg(0));
-      const std::string& NewName = InitPtrToString(Dag.getArg(0));
+      const std::string& NewName = InitPtrToString(Dag.getArg(1));
       EmitForwardOptionPropertyHandlingCode(OptDescs.FindOption(Name),
                                             IndentLevel, NewName, O);
     }