From 333ffb321ef83fb8e1157fbc6aeeb929bfaa2bb4 Mon Sep 17 00:00:00 2001
From: Puyan Lotfi <plotfi@fb.com>
Date: Mon, 22 Jul 2019 00:59:13 -0700
Subject: [PATCH] Fixing up IRGenModule to handle changes in CodeGenOptions.

DisableFPElim was removed from CGO in cfe r366645. This change fixes the build
for master-next.

(cherry picked from commit 5d0fec6e368c085c57cde43a73022b217e73be40)
---
 lib/IRGen/IRGenModule.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/IRGen/IRGenModule.cpp b/lib/IRGen/IRGenModule.cpp
index 95d4c158b0b..f2de13b9ecf 100644
--- a/lib/IRGen/IRGenModule.cpp
+++ b/lib/IRGen/IRGenModule.cpp
@@ -94,7 +94,9 @@ static clang::CodeGenerator *createClangCodeGenerator(ASTContext &Context,
 
   auto &CGO = Importer->getClangCodeGenOpts();
   CGO.OptimizationLevel = Opts.shouldOptimize() ? 3 : 0;
-  CGO.DisableFPElim = Opts.DisableFPElim;
+  CGO.setFramePointer(Opts.DisableFPElim
+                          ? clang::CodeGenOptions::FramePointerKind::All
+                          : clang::CodeGenOptions::FramePointerKind::None);
   CGO.DiscardValueNames = !Opts.shouldProvideValueNames();
   switch (Opts.DebugInfoLevel) {
   case IRGenDebugInfoLevel::None: