Revert r75641.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@76327 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj
index 1b16a7ca5752649a3f1127da940b7301b4c33aa9..26be7bb0b71997232280bcf05cc0ba76ccf1ee16 100644 (file)
--- a/clang.xcodeproj/project.pbxproj
+++ b/clang.xcodeproj/project.pbxproj
@@ -165,7 +165,7 @@
                DE67E7170C020EE400F66BC5 /* Sema.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE67E7160C020EE400F66BC5 /* Sema.cpp */; };
                DE67E71A0C020F4F00F66BC5 /* ParseAST.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE67E7190C020F4F00F66BC5 /* ParseAST.cpp */; };
                DE67E7280C02109800F66BC5 /* ParseAST.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DE67E7270C02109800F66BC5 /* ParseAST.h */; };
-               DE6951C70C4D1F5D00A5826B /* ASTRecordLayout.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DE6951C60C4D1F5D00A5826B /* ASTRecordLayout.h */; };
+               DE6951C70C4D1F5D00A5826B /* RecordLayout.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DE6951C60C4D1F5D00A5826B /* RecordLayout.h */; };
                DE6954640C5121BD00A5826B /* Token.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DE6954630C5121BD00A5826B /* Token.h */; };
                DE704B260D0FBEBE009C7762 /* SemaDeclObjC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE704B250D0FBEBE009C7762 /* SemaDeclObjC.cpp */; };
                DE704DD20D1668A4009C7762 /* HeaderMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE704DD10D1668A4009C7762 /* HeaderMap.cpp */; };
@@ -304,7 +304,7 @@
                                DEEBBD440C19C5D200A9FE82 /* TODO.txt in CopyFiles */,
                                84D9A88C0C1A581300AC7ABC /* AttributeList.h in CopyFiles */,
                                DEEBC3BA0C2363B800A9FE82 /* CodeGenTypes.h in CopyFiles */,
-                               DE6951C70C4D1F5D00A5826B /* ASTRecordLayout.h in CopyFiles */,
+                               DE6951C70C4D1F5D00A5826B /* RecordLayout.h in CopyFiles */,
                                DE6954640C5121BD00A5826B /* Token.h in CopyFiles */,
                                DEF2E95F0C5FBD74000C4259 /* InternalsManual.html in CopyFiles */,
                                DEC63B1C0C7B940600DBF169 /* CFG.h in CopyFiles */,
@@ -565,7 +565,7 @@
                DE67E7160C020EE400F66BC5 /* Sema.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = Sema.cpp; path = lib/Sema/Sema.cpp; sourceTree = "<group>"; tabWidth = 2; };
                DE67E7190C020F4F00F66BC5 /* ParseAST.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = ParseAST.cpp; path = lib/Sema/ParseAST.cpp; sourceTree = "<group>"; tabWidth = 2; };
                DE67E7270C02109800F66BC5 /* ParseAST.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ParseAST.h; path = clang/Sema/ParseAST.h; sourceTree = "<group>"; };
-               DE6951C60C4D1F5D00A5826B /* ASTRecordLayout.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = ASTRecordLayout.h; path = clang/AST/ASTRecordLayout.h; sourceTree = "<group>"; tabWidth = 2; };
+               DE6951C60C4D1F5D00A5826B /* RecordLayout.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = RecordLayout.h; path = clang/AST/RecordLayout.h; sourceTree = "<group>"; tabWidth = 2; };
                DE6954630C5121BD00A5826B /* Token.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Token.h; sourceTree = "<group>"; };
                DE704B250D0FBEBE009C7762 /* SemaDeclObjC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = SemaDeclObjC.cpp; path = lib/Sema/SemaDeclObjC.cpp; sourceTree = "<group>"; tabWidth = 2; };
                DE704BD10D1647E7009C7762 /* HeaderMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeaderMap.h; sourceTree = "<group>"; };
@@ -1141,7 +1141,6 @@
                                35BFBD2B0C9EDE1E006CB644 /* ASTConsumer.h */,
                                DE75ED280B044DC90020CF81 /* ASTContext.h */,
                                DEA09A6E0F31756F000C2258 /* ASTDiagnostic.h */,
-                               DE6951C60C4D1F5D00A5826B /* ASTRecordLayout.h */,
                                1A72BEAC0D641E9400B085E9 /* Attr.h */,
                                90FB99DE0F98FB1D008F9415 /* DeclContextInternals.h */,
                                90FB99DF0F98FB1D008F9415 /* DeclVisitor.h */,
@@ -1161,6 +1160,7 @@
                                DEDFE5CB0F7206CC0035BD10 /* NestedNameSpecifier.h */,
                                35EE48AE0E0C4CB200715C54 /* ParentMap.h */,
                                3547129D0C88881300B3E1D5 /* PrettyPrinter.h */,
+                               DE6951C60C4D1F5D00A5826B /* RecordLayout.h */,
                                DE3452800AEF1B1800DBC861 /* Stmt.h */,
                                DECB73550FA3EE5A00F5FBC7 /* StmtCXX.h */,
                                DE345F210AFD347900DBC861 /* StmtNodes.def */,

diff --git a/include/clang/AST/ASTRecordLayout.h b/include/clang/AST/RecordLayout.h
similarity index 94%
rename from include/clang/AST/ASTRecordLayout.h
rename to include/clang/AST/RecordLayout.h
index ba861f1c3a43bd6c94301b829dbc1d577cbf88c1..ab184563da23dd954500a3f6b6f36e0af0a48eee 100644 (file)
--- a/include/clang/AST/ASTRecordLayout.h
+++ b/include/clang/AST/RecordLayout.h
@@ -1,4 +1,4 @@
-//=== ASTRecordLayout.h - Layout information for a struct/union -*- C++ -*-===//
+//===--- RecordLayout.h - Layout information for a struct/union -*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,12 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This file defines the ASTRecordLayout interface.
+//  This file defines the RecordLayout interface.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_AST_ASTRECORDLAYOUT_H
-#define LLVM_CLANG_AST_ASTRECORDLAYOUT_H
+#ifndef LLVM_CLANG_AST_LAYOUTINFO_H
+#define LLVM_CLANG_AST_LAYOUTINFO_H
 
 #include "llvm/Support/DataTypes.h"
 

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index c378b8afc1f4bef59e06e019b90595f169ad7040..f7b913cc4aa4c92d2b07f389725359f6e782fdf7 100644 (file)
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -12,12 +12,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/ASTRecordLayout.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExternalASTSource.h"
+#include "clang/AST/RecordLayout.h"
 #include "clang/Basic/Builtins.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/TargetInfo.h"

diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 0a6d9fe128e25d7b6c2470e1d77009de6d81c265..efc37f768cfa65154abe61723a2eded0eb3af28e 100644 (file)
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -17,6 +17,7 @@
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclTemplate.h"
+#include "clang/AST/RecordLayout.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Basic/Builtins.h"
 #include "clang/Basic/TargetInfo.h"

diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index 2c29347c519c5529c6167e0494ee3321ae820596..c3d0402152561f704cbc628eb1bf0557fdaa7156 100644 (file)
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -13,7 +13,7 @@
 
 #include "clang/AST/APValue.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/ASTRecordLayout.h"
+#include "clang/AST/RecordLayout.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/AST/ASTDiagnostic.h"
 #include "clang/Basic/Builtins.h"

diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index f55998afe132d3118acb87a3450e6a31b524a447..a2d7b023d4a67d7f9137594bdd783aecc7821e2b 100644 (file)
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -14,9 +14,9 @@
 #include "CGDebugInfo.h"
 #include "CodeGenModule.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/ASTRecordLayout.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Expr.h"
+#include "clang/AST/RecordLayout.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Frontend/CompileOptions.h"

diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 129b4c7846ef75b2b4ba394cef63b95dcf434ea7..c1b2da04c8bfbbce5a1dabd729b27f8928d27978 100644 (file)
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -15,6 +15,7 @@
 #include "CodeGenModule.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclObjC.h"
+#include "clang/AST/RecordLayout.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Basic/TargetInfo.h"
 #include "llvm/Constants.h"

diff --git a/lib/CodeGen/CGObjCGNU.cpp b/lib/CodeGen/CGObjCGNU.cpp
index f75c2e37cc909bdcd9282f3637c49dfeb17381c4..9981bdb0118a748ade743cb39b3439319ee7b676 100644 (file)
--- a/lib/CodeGen/CGObjCGNU.cpp
+++ b/lib/CodeGen/CGObjCGNU.cpp
@@ -19,9 +19,9 @@
 #include "CodeGenFunction.h"
 
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/ASTRecordLayout.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
+#include "clang/AST/RecordLayout.h"
 #include "clang/AST/StmtObjC.h"
 
 #include "llvm/Intrinsics.h"

diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index 96b70b4013c5675d4afba58f8f8c04efc4e327ee..9b9cec661efa7cba654261615680c312f71be2a0 100644 (file)
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -16,9 +16,9 @@
 #include "CodeGenModule.h"
 #include "CodeGenFunction.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/ASTRecordLayout.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
+#include "clang/AST/RecordLayout.h"
 #include "clang/AST/StmtObjC.h"
 #include "clang/Basic/LangOptions.h"
 

diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp
index a3919403865d20dfd5e7c12d08f47266f5330326..41d2ba24fe3ddc2a0b530abf930718b8e1fef28e 100644 (file)
--- a/lib/CodeGen/CodeGenTypes.cpp
+++ b/lib/CodeGen/CodeGenTypes.cpp
@@ -15,7 +15,7 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Expr.h"
-#include "clang/AST/ASTRecordLayout.h"
+#include "clang/AST/RecordLayout.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetData.h"

diff --git a/lib/CodeGen/TargetABIInfo.cpp b/lib/CodeGen/TargetABIInfo.cpp
index c3f35453ba7f1649d57b2df8a0e90b55e3027ca4..328f0ae3d2d3b866432acf680f18bb58299fd8e3 100644 (file)
--- a/lib/CodeGen/TargetABIInfo.cpp
+++ b/lib/CodeGen/TargetABIInfo.cpp
@@ -14,7 +14,7 @@
 
 #include "ABIInfo.h"
 #include "CodeGenFunction.h"
-#include "clang/AST/ASTRecordLayout.h"
+#include "clang/AST/RecordLayout.h"
 #include "llvm/Type.h"
 
 using namespace clang;