Merge "Add --include-cfi compiler option."

1 files changed, 7 insertions, 0 deletions

diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index aa0db5d87b..bf3f8ec08a 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -65,6 +65,7 @@ class CompilerOptions FINAL {
                   double top_k_profile_threshold,
                   bool debuggable,
                   bool include_debug_symbols,
+                  bool include_cfi,
                   bool implicit_null_checks,
                   bool implicit_so_checks,
                   bool implicit_suspend_checks,
@@ -149,6 +150,11 @@ class CompilerOptions FINAL {
     return include_debug_symbols_;
   }
 
+  bool GetIncludeCFI() const {
+    // include-debug-symbols implies include-cfi.
+    return include_cfi_ || include_debug_symbols_;
+  }
+
   bool GetImplicitNullChecks() const {
     return implicit_null_checks_;
   }
@@ -207,6 +213,7 @@ class CompilerOptions FINAL {
   const double top_k_profile_threshold_;
   const bool debuggable_;
   const bool include_debug_symbols_;
+  const bool include_cfi_;
   const bool implicit_null_checks_;
   const bool implicit_so_checks_;
   const bool implicit_suspend_checks_;