llvmc: fix two tests, remove XFAILs.

Tested on Linux and Darwin; please add platform-specific XFAILs/mail me a bug
report if this still fails.

llvm-svn: 110998

llvm/test/LLVMC/MultiplePluginPriorities.td

@@ -4,10 +4,6 @@
 // Disable for Darwin PPC: <rdar://problem/7598390>
 // XFAIL: powerpc-apple-darwin
 
-// Generally XFAIL'ed for now, this is (sometimes?) failing on x86_64-apple-darwin10.
-// RUN: false
-// XFAIL: *
-
 include "llvm/CompilerDriver/Common.td"
 
 def Graph : CompilationGraph<[]>;

llvm/test/LLVMC/OutputSuffixHook.td

@@ -2,7 +2,6 @@
 // RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
 // RUN: FileCheck -input-file %t %s
 // RUN: %compile_cxx -fexceptions -x c++ %t
-// XFAIL: *
 
 include "llvm/CompilerDriver/Common.td"
 
@@ -13,7 +12,7 @@ def OptList : OptionList<[
 ]>;
 
 def dummy_tool : Tool<[
-(cmd_line "dummy_cmd $INFILE"),
+(command "dummy_cmd"),
 (in_language "dummy_lang"),
 (out_language "dummy_lang"),
 (actions (case

llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp

@@ -2177,8 +2177,8 @@ void EmitGenerateActionMethodHeader(const ToolDescription& D,
       << "std::vector<std::pair<unsigned, std::string> > vec;\n";
     O.indent(Indent2) << "bool stop_compilation = !HasChildren;\n";
     O.indent(Indent2) << "bool no_out_file = false;\n";
-    O.indent(Indent2) << "const char* output_suffix = \""
-                      << D.OutputSuffix << "\";\n";
+    O.indent(Indent2) << "std::string output_suffix(\""
+                      << D.OutputSuffix << "\");\n";
   }
 }
 
@@ -2235,7 +2235,8 @@ void EmitGenerateActionMethod (const ToolDescription& D,
 
   O.indent(Indent3) << "out_file = this->OutFilename("
                     << (IsJoin ? "sys::Path(),\n" : "inFile,\n");
-  O.indent(Indent4) << "TempDir, stop_compilation, output_suffix).str();\n\n";
+  O.indent(Indent4) <<
+    "TempDir, stop_compilation, output_suffix.c_str()).str();\n\n";
   O.indent(Indent3) << "vec.push_back(std::make_pair(65536, out_file));\n";
 
   O.indent(Indent2) << "}\n\n";