Change FunctionInfo from being an annotation put on Functions to be
something which is mapped from functions.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8580 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/Interpreter/ExecutionAnnotations.h b/lib/ExecutionEngine/Interpreter/ExecutionAnnotations.h
index e17aa4b..cca1233 100644
--- a/lib/ExecutionEngine/Interpreter/ExecutionAnnotations.h
+++ b/lib/ExecutionEngine/Interpreter/ExecutionAnnotations.h
@@ -15,24 +15,10 @@
 // information about the function, including the number of types present in the
 // function, and the number of values for each type.
 //
-// This annotation object is created on demand, and attaches other annotation
-// objects to the instructions in the function when it's created.
-//
-static AnnotationID FunctionInfoAID(
-	            AnnotationManager::getID("Interpreter::FunctionInfo"));
-
-struct FunctionInfo : public Annotation {
+struct FunctionInfo {
   FunctionInfo(Function *F);
   std::vector<unsigned> NumPlaneElements;
 
-  // Create - Factory function to allow FunctionInfo annotations to be
-  // created on demand.
-  //
-  static Annotation *Create(AnnotationID AID, const Annotable *O, void *) {
-    assert(AID == FunctionInfoAID);
-    return new FunctionInfo(cast<Function>((Value*)O));
-  }
-
 private:
   unsigned getValueSlot(const Value *V);
 };