1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/Support/TargetRegistry.cpp b/llvm/lib/Support/TargetRegistry.cpp
index 1b8ad3a0103..bed9ed64f80 100644
--- a/llvm/lib/Support/TargetRegistry.cpp
+++ b/llvm/lib/Support/TargetRegistry.cpp
@@ -78,8 +78,8 @@ const Target *TargetRegistry::lookupTarget(const std::string &TT,
 
   auto J = std::find_if(std::next(I), targets().end(), ArchMatch);
   if (J != targets().end()) {
-    Error = ("Cannot choose between targets \"" + I->Name +
-            "\" a nd \"" + J->Name + "\"").str();
+    Error = std::string("Cannot choose between targets \"") + I->Name +
+            "\" and \"" + J->Name + "\"";
     return nullptr;
   }
 
@@ -87,16 +87,16 @@ const Target *TargetRegistry::lookupTarget(const std::string &TT,
 }
 
 void TargetRegistry::RegisterTarget(Target &T,
-                                    StringRef Name,
-                                    StringRef ShortDesc,
+                                    const char *Name,
+                                    const char *ShortDesc,
                                     Target::ArchMatchFnTy ArchMatchFn,
                                     bool HasJIT) {
-  assert(!Name.empty() && !ShortDesc.empty() && ArchMatchFn &&
+  assert(Name && ShortDesc && ArchMatchFn &&
          "Missing required target information!");
 
   // Check if this target has already been initialized, we allow this as a
   // convenience to some clients.
-  if (!T.Name.empty())
+  if (T.Name)
     return;
          
   // Add to the list of targets.