Add some enum goodness as requested by Chris. Now instead of storing the
active C++ ABI as a raw string, we store it as an enum. This should improve
performance somewhat.
And yes, this time, I started from a clean build directory, and
all the tests passed. :)
llvm-svn: 111507
diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index 907c359..ff77561 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -1463,8 +1463,6 @@
// This class implements layout specific to the Microsoft ABI.
class MSRecordLayoutBuilder: public RecordLayoutBuilder {
- friend class ASTContext;
-
public:
MSRecordLayoutBuilder(ASTContext& Ctx, EmptySubobjectMap *EmptySubobjects):
RecordLayoutBuilder(Ctx, EmptySubobjects) {}
@@ -1514,10 +1512,13 @@
// When compiling for Microsoft, use the special MS builder.
RecordLayoutBuilder *Builder;
- if (Target.getCXXABI() == "microsoft")
- Builder = new MSRecordLayoutBuilder(*this, &EmptySubobjects);
- else
+ switch (Target.getCXXABI()) {
+ default:
Builder = new RecordLayoutBuilder(*this, &EmptySubobjects);
+ break;
+ case CXXABI_Microsoft:
+ Builder = new MSRecordLayoutBuilder(*this, &EmptySubobjects);
+ }
Builder->Layout(RD);
// FIXME: This is not always correct. See the part about bitfields at