diff --git a/llvm/lib/CodeGen/GCMetadata.cpp b/llvm/lib/CodeGen/GCMetadata.cpp
index c02a73b70804..0b5c6f0662cf 100644
--- a/llvm/lib/CodeGen/GCMetadata.cpp
+++ b/llvm/lib/CodeGen/GCMetadata.cpp
@@ -99,7 +99,9 @@ getOrCreateCollector(const Module *M, const std::string &Name) {
 }
 
 CollectorMetadata &CollectorModuleMetadata::get(const Function &F) {
+  assert(!F.isDeclaration() && "Can only get GCFunctionInfo for a definition!");
   assert(F.hasCollector());
+  
   function_map_type::iterator I = Map.find(&F);
   if (I != Map.end())
     return *I->second;
diff --git a/llvm/lib/CodeGen/GCStrategy.cpp b/llvm/lib/CodeGen/GCStrategy.cpp
index 629a2e13dee4..f5cb9ab63123 100644
--- a/llvm/lib/CodeGen/GCStrategy.cpp
+++ b/llvm/lib/CodeGen/GCStrategy.cpp
@@ -144,7 +144,7 @@ bool LowerIntrinsics::doInitialization(Module &M) {
   CollectorModuleMetadata *CMM = getAnalysisToUpdate<CollectorModuleMetadata>();
   assert(CMM && "LowerIntrinsics didn't require CollectorModuleMetadata!?");
   for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
-    if (I->hasCollector())
+    if (!I->isDeclaration() && I->hasCollector())
       CMM->get(*I); // Instantiate the Collector.
   
   bool MadeChange = false;