diff options
| author | Vladimir Marko <vmarko@google.com> | 2017-06-05 09:17:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-05 09:17:20 +0000 |
| commit | 996855366919004b0089089f152abe94b0188270 (patch) | |
| tree | 51aee077f57718e94a78dde0f334eef63a1e3fbe /compiler/optimizing/code_generator.h | |
| parent | 034a87d3acaf35bb58a84140b6bf3fa3ff813db2 (diff) | |
| parent | b21fad2b8e9c562da1bc4bde972e8ca9ddf66375 (diff) | |
Merge "Rename kDexCacheViaMethod to kRuntimeCall for HLoadClass/String." am: 2c97600c11 am: da44fda927
am: b21fad2b8e
Change-Id: I22faddc4f2d6481baea1641b9a18d30ffb207dc6
Diffstat (limited to 'compiler/optimizing/code_generator.h')
| -rw-r--r-- | compiler/optimizing/code_generator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index 14f58657924..fc2f4c1a6fc 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -542,7 +542,7 @@ class CodeGenerator : public DeletableArenaObject<kArenaAllocCodeGenerator> { case HLoadString::LoadKind::kBssEntry: DCHECK(load->NeedsEnvironment()); return LocationSummary::kCallOnSlowPath; - case HLoadString::LoadKind::kDexCacheViaMethod: + case HLoadString::LoadKind::kRuntimeCall: DCHECK(load->NeedsEnvironment()); return LocationSummary::kCallOnMainOnly; case HLoadString::LoadKind::kJitTableAddress: |