diff options
| author | 2015-12-24 11:55:50 +0000 | |
|---|---|---|
| committer | 2015-12-24 11:55:50 +0000 | |
| commit | fed399c39a89a04966cf9c7da300c8a1d6404453 (patch) | |
| tree | b1c6399751c98babd3839bd4d5ff4a1f6a5c274c /compiler/driver/compiler_options.cc | |
| parent | 58b2329de74a73d2f0a7ed001e50cc39df33d9da (diff) | |
| parent | 7f65b4669c52976cd5713dae47b901707ed77110 (diff) | |
Merge internal master into aosp/master.
Diffstat (limited to 'compiler/driver/compiler_options.cc')
| -rw-r--r-- | compiler/driver/compiler_options.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/driver/compiler_options.cc b/compiler/driver/compiler_options.cc index 8c38cf263e..209bb5a3c2 100644 --- a/compiler/driver/compiler_options.cc +++ b/compiler/driver/compiler_options.cc @@ -31,6 +31,7 @@ CompilerOptions::CompilerOptions() num_dex_methods_threshold_(kDefaultNumDexMethodsThreshold), inline_depth_limit_(kUnsetInlineDepthLimit), inline_max_code_units_(kUnsetInlineMaxCodeUnits), + no_inline_from_(nullptr), include_patch_information_(kDefaultIncludePatchInformation), top_k_profile_threshold_(kDefaultTopKProfileThreshold), debuggable_(false), @@ -59,6 +60,7 @@ CompilerOptions::CompilerOptions(CompilerFilter compiler_filter, size_t num_dex_methods_threshold, size_t inline_depth_limit, size_t inline_max_code_units, + const DexFile* no_inline_from, bool include_patch_information, double top_k_profile_threshold, bool debuggable, @@ -79,6 +81,7 @@ CompilerOptions::CompilerOptions(CompilerFilter compiler_filter, num_dex_methods_threshold_(num_dex_methods_threshold), inline_depth_limit_(inline_depth_limit), inline_max_code_units_(inline_max_code_units), + no_inline_from_(no_inline_from), include_patch_information_(include_patch_information), top_k_profile_threshold_(top_k_profile_threshold), debuggable_(debuggable), |