diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index d34b0f5..45cd6a7 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -29,7 +29,8 @@
 /// block.
 llvm::AllocaInst *CodeGenFunction::CreateTempAlloca(const llvm::Type *Ty,
                                                     const char *Name) {
-  // FIXME: Should not pass name if names are disabled in IRBuilder.
+  if (!Builder.isNamePreserving())
+    Name = "";
   return new llvm::AllocaInst(Ty, 0, Name, AllocaInsertPt);
 }