[llvm] r220918 - Fix Twine corruption problem with diagnostics.

[Diego Novillo]

Author: dnovillo
Date: Thu Oct 30 13:48:41 2014
New Revision: 220918

URL: http://llvm.org/viewvc/llvm-project?rev=220918&view=rev
Log:
Fix Twine corruption problem with diagnostics.

This fixes the autobuilders I broke with a recent patch. Thanks echristo
and dblaikie for beating me with a clue stick.

Modified:
    llvm/trunk/lib/Transforms/Scalar/SampleProfile.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/SampleProfile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SampleProfile.cpp?rev=220918&r1=220917&r2=220918&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/SampleProfile.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/SampleProfile.cpp Thu Oct 30 13:48:41 2014
@@ -740,8 +740,7 @@ bool SampleProfileLoader::doInitializati
   if (std::error_code EC =
           SampleProfileReader::create(Filename, Reader, M.getContext())) {
     std::string Msg = "Could not open profile: " + EC.message();
-    DiagnosticInfoSampleProfile Diag(Filename.data(), Msg);
-    M.getContext().diagnose(Diag);
+    M.getContext().diagnose(DiagnosticInfoSampleProfile(Filename.data(), Msg));
     return false;
   }
   ProfileIsValid = (Reader->read() == sampleprof_error::success);