diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp
index 6d660111ac3..cb7660596a1 100644
--- a/lib/AsmParser/LLLexer.cpp
+++ b/lib/AsmParser/LLLexer.cpp
@@ -603,7 +603,8 @@ lltok::Kind LLLexer::LexIdentifier() {
     if (JustWhitespaceNewLine(CurPtr))
       return lltok::kw_zeroext;
   } else if (Len == 6 && !memcmp(StartChar, "malloc", 6)) {
-    // Autoupgrade malloc instruction
+    // FIXME: Remove in LLVM 3.0.
+    // Autoupgrade malloc instruction.
     return lltok::kw_malloc;
   }
 
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index 749ce9360f2..da8f4eaac5d 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -70,6 +70,7 @@ bool LLParser::Run() {
 /// module.
 bool LLParser::ValidateEndOfModule() {
   // Update auto-upgraded malloc calls from "autoupgrade_malloc" to "malloc".
+  // FIXME: Remove in LLVM 3.0.
   if (MallocF) {
     MallocF->setName("malloc");
     // If setName() does not set the name to "malloc", then there is already a