From e4a93d5e1365b264f941e324d8df7b0cd35ae2b3 Mon Sep 17 00:00:00 2001
From: Andrzej Kotulski <akotulski@fb.com>
Date: Thu, 8 Dec 2016 04:52:11 -0800
Subject: [PATCH] [c++] s/cxx_experimental/cxx

Reviewed By: dulmarod

Differential Revision: D4298896

fbshipit-source-id: 6666ef8
---
 infer/src/base/Config.ml          | 4 ++--
 infer/src/base/Config.mli         | 2 +-
 infer/src/clang/ClangCommand.re   | 2 +-
 infer/src/clang/cFrontend_decl.ml | 2 +-
 infer/src/clang/cLocation.ml      | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml
index 870b32402..b40afd090 100644
--- a/infer/src/base/Config.ml
+++ b/infer/src/base/Config.ml
@@ -737,7 +737,7 @@ and copy_propagation =
   CLOpt.mk_bool ~deprecated:["copy-propagation"] ~long:"copy-propagation"
     "Perform copy-propagation on the IR"
 
-and cxx_experimental =
+and cxx =
   CLOpt.mk_bool ~deprecated:["cxx-experimental"] ~long:"cxx"
     ~default:true
     ~exes:CLOpt.[Clang]
@@ -1470,7 +1470,7 @@ and continue_capture = !continue
 and copy_propagation = !copy_propagation
 and crashcontext = !crashcontext
 and create_harness = !android_harness
-and cxx_experimental = !cxx_experimental
+and cxx = !cxx
 and debug_mode = !debug
 and debug_exceptions = !debug_exceptions
 and dependency_mode = !dependencies
diff --git a/infer/src/base/Config.mli b/infer/src/base/Config.mli
index 125d6179b..93541c227 100644
--- a/infer/src/base/Config.mli
+++ b/infer/src/base/Config.mli
@@ -172,7 +172,7 @@ val continue_capture : bool
 val copy_propagation : bool
 val crashcontext : bool
 val create_harness : bool
-val cxx_experimental : bool
+val cxx : bool
 val debug_mode : bool
 val debug_exceptions : bool
 val dependency_mode : bool
diff --git a/infer/src/clang/ClangCommand.re b/infer/src/clang/ClangCommand.re
index 830c88296..7f134011c 100644
--- a/infer/src/clang/ClangCommand.re
+++ b/infer/src/clang/ClangCommand.re
@@ -28,7 +28,7 @@ let plugin_name = "BiniouASTExporter";
 
 
 /** whether to amend include search path with C++ model headers */
-let infer_cxx_models = Config.cxx_experimental;
+let infer_cxx_models = Config.cxx;
 
 let value_of_argv_option argv opt_name =>
   IList.fold_left
diff --git a/infer/src/clang/cFrontend_decl.ml b/infer/src/clang/cFrontend_decl.ml
index 3d60719f5..36dc270e1 100644
--- a/infer/src/clang/cFrontend_decl.ml
+++ b/infer/src/clang/cFrontend_decl.ml
@@ -215,7 +215,7 @@ struct
            let class_decl = Ast_utils.get_decl parent_ptr in
            (match class_decl with
             | Some (CXXRecordDecl _)
-            | Some (ClassTemplateSpecializationDecl _) when Config.cxx_experimental ->
+            | Some (ClassTemplateSpecializationDecl _) when Config.cxx ->
                 let curr_class = CContext.ContextClsDeclPtr parent_ptr in
                 process_methods trans_unit_ctx tenv cg cfg curr_class [dec]
             | Some dec ->
diff --git a/infer/src/clang/cLocation.ml b/infer/src/clang/cLocation.ml
index 2d247db17..533a05805 100644
--- a/infer/src/clang/cLocation.ml
+++ b/infer/src/clang/cLocation.ml
@@ -67,8 +67,8 @@ let should_translate trans_unit_ctx (loc_start, loc_end) decl_trans_context ~tra
   map_file_of equal_current_source loc_end
   || map_file_of equal_current_source loc_start
   || file_in_models
-  || (Config.cxx_experimental && map_file_of equal_header_of_current_source loc_start)
-  || (Config.cxx_experimental && decl_trans_context = `Translation && translate_on_demand
+  || (Config.cxx && map_file_of equal_header_of_current_source loc_start)
+  || (Config.cxx && decl_trans_context = `Translation && translate_on_demand
       && not Config.testing_mode)
 
 let should_translate_lib trans_unit_ctx source_range decl_trans_context ~translate_when_used =