6 files changed, 16 insertions, 19 deletions
diff --git a/clang/include/clang/AST/ASTContext.h b/clang/include/clang/AST/ASTContext.h
index 773fe23c55a..ae3ff0c2216 100644
--- a/clang/include/clang/AST/ASTContext.h
+++ b/clang/include/clang/AST/ASTContext.h
@@ -310,7 +310,7 @@ private:
 
 public:
   void Emit(llvm::Serializer& S) const;
-  static ASTContext* Materialize(llvm::Deserializer& D);  
+  static ASTContext* Create(llvm::Deserializer& D);  
 };
   
 }  // end namespace clang
diff --git a/clang/include/clang/AST/Decl.h b/clang/include/clang/AST/Decl.h
index c3017f95214..ba302b90e13 100644
--- a/clang/include/clang/AST/Decl.h
+++ b/clang/include/clang/AST/Decl.h
@@ -166,9 +166,6 @@ public:
     
   /// Create - Deserialize a Decl from Bitcode.
   static Decl* Create(llvm::Deserializer& D);
-  
-  /// Materialize - Deserialize a Decl from Bitcode. (DEPRECATED)
-  static Decl* Materialize(llvm::Deserializer& D) { return Create(D); }
 
 protected:
   /// EmitImpl - Provides the subclass-specific serialization logic for
diff --git a/clang/include/clang/AST/Expr.h b/clang/include/clang/AST/Expr.h
index b3279a0429e..7f47a299b3d 100644
--- a/clang/include/clang/AST/Expr.h
+++ b/clang/include/clang/AST/Expr.h
@@ -111,8 +111,8 @@ public:
   }
   static bool classof(const Expr *) { return true; }
   
-  static inline Expr* Materialize(llvm::Deserializer& D) {
-    return cast<Expr>(Stmt::Materialize(D));    
+  static inline Expr* Create(llvm::Deserializer& D) {
+    return cast<Expr>(Stmt::Create(D));    
   }
 };
 
diff --git a/clang/include/clang/AST/Stmt.h b/clang/include/clang/AST/Stmt.h
index fe8e6db9c1e..9e557a323e3 100644
--- a/clang/include/clang/AST/Stmt.h
+++ b/clang/include/clang/AST/Stmt.h
@@ -115,7 +115,7 @@ public:
   }
   
   void Emit(llvm::Serializer& S) const;
-  static Stmt* Materialize(llvm::Deserializer& D);
+  static Stmt* Create(llvm::Deserializer& D);
   
   virtual void EmitImpl(llvm::Serializer& S) const {
     // This method will eventually be a pure-virtual function.
diff --git a/clang/include/clang/AST/Type.h b/clang/include/clang/AST/Type.h
index 6df13be7b01..a264c24c89d 100644
--- a/clang/include/clang/AST/Type.h
+++ b/clang/include/clang/AST/Type.h
@@ -399,7 +399,7 @@ public:
   static bool classof(const BuiltinType *) { return true; }
   
   void Emit(llvm::Serializer& S) const;
-  static BuiltinType* Materialize(llvm::Deserializer& D);
+  static BuiltinType* Create(llvm::Deserializer& D);
 };
 
 /// ComplexType - C99 6.2.5p11 - Complex values.  This supports the C99 complex
@@ -428,7 +428,7 @@ public:
   static bool classof(const ComplexType *) { return true; }
   
   void Emit(llvm::Serializer& S) const;
-  static ComplexType* Materialize(llvm::Deserializer& D);
+  static ComplexType* Create(llvm::Deserializer& D);
 };
 
 
@@ -458,7 +458,7 @@ public:
   static bool classof(const PointerType *) { return true; }
   
   void Emit(llvm::Serializer& S) const;
-  static PointerType* Materialize(llvm::Deserializer& D);
+  static PointerType* Create(llvm::Deserializer& D);
 };
 
 /// ReferenceType - C++ 8.3.2 - Reference Declarators.
@@ -485,7 +485,7 @@ public:
   static bool classof(const ReferenceType *) { return true; }
   
   void Emit(llvm::Serializer& S) const;
-  static ReferenceType* Materialize(llvm::Deserializer& D);
+  static ReferenceType* Create(llvm::Deserializer& D);
 };
 
 /// ArrayType - C99 6.7.5.2 - Array Declarators.
@@ -575,7 +575,7 @@ public:
   static bool classof(const ConstantArrayType *) { return true; }
   
   void Emit(llvm::Serializer& S) const;
-  static ConstantArrayType* Materialize(llvm::Deserializer& D);
+  static ConstantArrayType* Create(llvm::Deserializer& D);
 };
 
 // FIXME: VariableArrayType's aren't uniqued (since expressions aren't).
@@ -612,7 +612,7 @@ public:
   }
   
   void Emit(llvm::Serializer& S) const;
-  static VariableArrayType* Materialize(llvm::Deserializer& D);
+  static VariableArrayType* Create(llvm::Deserializer& D);
 };
 
 /// VectorType - GCC generic vector type. This type is created using
@@ -655,7 +655,7 @@ public:
   static bool classof(const VectorType *) { return true; }
   
   void Emit(llvm::Serializer& S) const;
-  static VectorType* Materialize(llvm::Deserializer& D);
+  static VectorType* Create(llvm::Deserializer& D);
 };
 
 /// OCUVectorType - Extended vector type. This type is created using
@@ -769,7 +769,7 @@ public:
   static bool classof(const FunctionTypeNoProto *) { return true; }
   
   void Emit(llvm::Serializer& S) const { EmitFunctionTypeInternal(S); }
-  static FunctionTypeNoProto* Materialize(llvm::Deserializer& D);
+  static FunctionTypeNoProto* Create(llvm::Deserializer& D);
 };
 
 /// FunctionTypeProto - Represents a prototype with argument type info, e.g.
@@ -820,7 +820,7 @@ public:
                       bool isVariadic);
   
   void Emit(llvm::Serializer& S) const;
-  static FunctionTypeProto* Materialize(llvm::Deserializer& D);
+  static FunctionTypeProto* Create(llvm::Deserializer& D);
   
 protected:
   // Used by deserialization.
@@ -853,7 +853,7 @@ public:
   static bool classof(const TypedefType *) { return true; }
   
   void Emit(llvm::Serializer& S) const;
-  static TypedefType* Materialize(llvm::Deserializer& D);
+  static TypedefType* Create(llvm::Deserializer& D);
 };
 
 /// TypeOfExpr (GCC extension).
diff --git a/clang/include/clang/Basic/IdentifierTable.h b/clang/include/clang/Basic/IdentifierTable.h
index ca3f147062b..79d8573221c 100644
--- a/clang/include/clang/Basic/IdentifierTable.h
+++ b/clang/include/clang/Basic/IdentifierTable.h
@@ -194,8 +194,8 @@ public:
   ///  are actually referenced are serialized.
   void Emit(llvm::Serializer& S) const;
   
-  /// Materialize - Deserialize an IdentifierTable from a bitstream.
-  static IdentifierTable* Materialize(llvm::Deserializer& D);
+  /// Create - Deserialize an IdentifierTable from a bitstream.
+  static IdentifierTable* Create(llvm::Deserializer& D);
   
 private:  
   /// This ctor is not intended to be used by anyone except for object