Index: lib/CodeGen/CodeGenModule.h
===================================================================
--- lib/CodeGen/CodeGenModule.h
+++ lib/CodeGen/CodeGenModule.h
@@ -298,7 +298,8 @@
   llvm::BumpPtrAllocator MangledNamesAllocator;
   
   /// Global annotations.
-  std::vector<llvm::Constant*> Annotations;
+  typedef std::map<const ValueDecl*, llvm::WeakVH> AnnotationMap;
+  AnnotationMap NeededAnnotations;
 
   /// Map used to get unique annotation strings.
   llvm::StringMap<llvm::Constant*> AnnotationStrings;
Index: lib/CodeGen/CodeGenModule.cpp
===================================================================
--- lib/CodeGen/CodeGenModule.cpp
+++ lib/CodeGen/CodeGenModule.cpp
@@ -744,6 +744,8 @@
 
   if (const SectionAttr *SA = FD->getAttr<SectionAttr>())
     F->setSection(SA->getName());
+  if (FD->hasAttr<AnnotateAttr>())
+    AddGlobalAnnotations(FD, F);
 }
 
 void CodeGenModule::AddUsedGlobal(llvm::GlobalValue *GV) {
@@ -953,9 +955,25 @@
 }
 
 void CodeGenModule::EmitGlobalAnnotations() {
-  if (Annotations.empty())
+  if (NeededAnnotations.empty())
     return;
 
+  std::vector<llvm::Constant*> Annotations;
+
+  for (AnnotationMap::const_iterator it = NeededAnnotations.begin(),
+       end = NeededAnnotations.end(); it != end; ++it) {
+    llvm::Value* V = it->second;
+    if (!V)
+      continue;
+    llvm::GlobalValue* GV = cast<llvm::GlobalValue>(V);
+    const ValueDecl* D = it->first;
+    // Get the struct elements for these annotations.
+    for (specific_attr_iterator<AnnotateAttr>
+        ai = D->specific_attr_begin<AnnotateAttr>(),
+        ae = D->specific_attr_end<AnnotateAttr>(); ai != ae; ++ai)
+      Annotations.push_back(EmitAnnotateAttr(GV, *ai, D->getLocation()));
+  }
+
   // Create a new global variable for the ConstantStruct in the Module.
   llvm::Constant *Array = llvm::ConstantArray::get(llvm::ArrayType::get(
     Annotations[0]->getType(), Annotations.size()), Annotations);
@@ -1017,11 +1035,7 @@
 void CodeGenModule::AddGlobalAnnotations(const ValueDecl *D,
                                          llvm::GlobalValue *GV) {
   assert(D->hasAttr<AnnotateAttr>() && "no annotate attribute");
-  // Get the struct elements for these annotations.
-  for (specific_attr_iterator<AnnotateAttr>
-       ai = D->specific_attr_begin<AnnotateAttr>(),
-       ae = D->specific_attr_end<AnnotateAttr>(); ai != ae; ++ai)
-    Annotations.push_back(EmitAnnotateAttr(GV, *ai, D->getLocation()));
+  NeededAnnotations[D] = GV;
 }
 
 bool CodeGenModule::MayDeferGeneration(const ValueDecl *Global) {
@@ -2077,8 +2091,6 @@
     AddGlobalCtor(Fn, CA->getPriority());
   if (const DestructorAttr *DA = D->getAttr<DestructorAttr>())
     AddGlobalDtor(Fn, DA->getPriority());
-  if (D->hasAttr<AnnotateAttr>())
-    AddGlobalAnnotations(D, Fn);
 }
 
 void CodeGenModule::EmitAliasDefinition(GlobalDecl GD) {
Index: test/CodeGen/annotations-forward-declaration-crash.c
===================================================================
--- /dev/null
+++ test/CodeGen/annotations-forward-declaration-crash.c
@@ -0,0 +1,8 @@
+// RUN: %clang_cc1 %s -o - -emit-llvm | FileCheck %s
+
+// CHECK: private unnamed_addr constant [4 x i8] c"foo\00", section "llvm.metadata"
+// CHECK: @llvm.global.annotations = appending global [1 x { i8*, i8*, i8*, i32 }] [{ i8*, i8*, i8*, i32 } { i8* bitcast (void ()* @foo to i8*), i8* getelementptr inbounds ([4 x i8]* {{.+}}, i32 0, i32 0), i8* getelementptr inbounds ([{{.+}} x i8]* {{.+}}, i32 0, i32 0), i32 8 }], section "llvm.metadata"
+
+__attribute__((annotate("foo"))) void foo();
+void bar(){foo();}
+void foo() {}
Index: test/CodeGen/annotations-forward-declaration.c
===================================================================
--- /dev/null
+++ test/CodeGen/annotations-forward-declaration.c
@@ -0,0 +1,7 @@
+// RUN: %clang_cc1 %s -o - -emit-llvm | FileCheck %s
+
+// CHECK: private unnamed_addr constant [4 x i8] c"foo\00", section "llvm.metadata"
+// CHECK: @llvm.global.annotations = appending global [1 x { i8*, i8*, i8*, i32 }] [{ i8*, i8*, i8*, i32 } { i8* bitcast (void ()* @foo to i8*), i8* getelementptr inbounds ([4 x i8]* {{.+}}, i32 0, i32 0), i8* getelementptr inbounds ([{{.+}} x i8]* {{.+}}, i32 0, i32 0), i32 6 }], section "llvm.metadata"
+
+__attribute__((annotate("foo"))) void foo(void);
+void bar(){foo();}