1 files changed, 3 insertions, 14 deletions
diff --git a/clang/lib/Basic/LangOptions.cpp b/clang/lib/Basic/LangOptions.cpp
index c08670c..a74efdc 100644
--- a/clang/lib/Basic/LangOptions.cpp
+++ b/clang/lib/Basic/LangOptions.cpp
@@ -24,7 +24,7 @@ void LangOptions::resetNonModularOptions() {
 #define LANGOPT(Name, Bits, Default, Description)
 #define BENIGN_LANGOPT(Name, Bits, Default, Description) Name = Default;
 #define BENIGN_ENUM_LANGOPT(Name, Type, Bits, Default, Description) \
-  Name = static_cast<unsigned>(Default);
+  Name = Default;
 #include "clang/Basic/LangOptions.def"
 
   // These options do not affect AST generation.
@@ -53,17 +53,6 @@ FPOptions FPOptions::defaultWithoutTrailingStorage(const LangOptions &LO) {
   return result;
 }
 
-LLVM_DUMP_METHOD void FPOptions::dump() {
-#define OPTION(NAME, TYPE, WIDTH, PREVIOUS)                                    \
-  llvm::errs() << "\n " #NAME " " << get##NAME();
-#include "clang/Basic/FPOptions.def"
-  llvm::errs() << "\n";
-}
-
-LLVM_DUMP_METHOD void FPOptionsOverride::dump() {
-#define OPTION(NAME, TYPE, WIDTH, PREVIOUS)                                    \
-  if (has##NAME##Override())                                                   \
-    llvm::errs() << "\n " #NAME " Override is " << get##NAME##Override();
-#include "clang/Basic/FPOptions.def"
-  llvm::errs() << "\n";
+bool FPOptions::requiresTrailingStorage(const LangOptions &LO) {
+  return getAsOpaqueInt() != defaultWithoutTrailingStorage(LO).getAsOpaqueInt();
 }