diff options
author | Andreas Gampe <agampe@google.com> | 2016-07-19 22:34:53 -0700 |
---|---|---|
committer | Vladimir Marko <vmarko@google.com> | 2016-07-20 11:44:25 +0100 |
commit | 6740997e6934bbca27d5830a32352d82aabbd38b (patch) | |
tree | 684ab2e46ddeaaf251fb6919bf64295810e46afa /compiler/optimizing/code_generator_arm.cc | |
parent | dc4f4d42aa1712a7ac2e4c24c0aebe58b71ae2c0 (diff) |
ART: Change return types of field access entrypoints
Ensure that return types guarantee full-width data as the compiled
code and mterp expect by using size_t and ssize_t.
This fixes Clang no longer sign-/zero-extending small return types.
Bug: 30232671
Test: m ART_TEST_RUN_TEST_NDEBUG=true ART_TEST_INTERPRETER=true test-art-host-run-test
Change-Id: Ic505befc6c94e2dccbc8abf2b13d4c2d662e68d1
Diffstat (limited to 'compiler/optimizing/code_generator_arm.cc')
-rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 1aa7b5404c..3d12aedf7f 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -316,7 +316,7 @@ class TypeCheckSlowPathARM : public SlowPathCode { instruction_->GetDexPc(), this); CheckEntrypointTypes< - kQuickInstanceofNonTrivial, uint32_t, const mirror::Class*, const mirror::Class*>(); + kQuickInstanceofNonTrivial, size_t, const mirror::Class*, const mirror::Class*>(); arm_codegen->Move32(locations->Out(), Location::RegisterLocation(R0)); } else { DCHECK(instruction_->IsCheckCast()); |