diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 20fbbd2..4321765 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -1226,11 +1226,10 @@
     str.assign(Literal->getStrData(), Literal->getByteLength());
     StringLength = str.length();
   }
-  llvm::StringMapEntry<llvm::Constant *> &Entry = 
-    CFConstantStringMap.GetOrCreateValue(&str[0], &str[str.length()]);
+  llvm::Constant *&Entry = CFConstantStringMap[str];
   
-  if (llvm::Constant *C = Entry.getValue())
-    return C;
+  if (Entry)
+    return Entry;
   
   llvm::Constant *Zero = getLLVMContext().getNullValue(llvm::Type::Int32Ty);
   llvm::Constant *Zeros[] = { Zero, Zero };
@@ -1320,7 +1319,7 @@
                                 "_unnamed_cfstring_");
   if (const char *Sect = getContext().Target.getCFStringSection())
     GV->setSection(Sect);
-  Entry.setValue(GV);
+  Entry = GV;
   
   return GV;
 }