diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-09-26 22:29:18 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-09-27 01:24:39 -0700 |
| commit | 5d40f182181488eb39ccd19ffd306bb1fb9740c9 (patch) | |
| tree | f76c0593d7be5975543411a3d85134e846774ba5 /Android.mk | |
| parent | 1ff230d113d25fbcd2986773799ac1ef504a6af0 (diff) | |
| download | art-5d40f182181488eb39ccd19ffd306bb1fb9740c9.zip art-5d40f182181488eb39ccd19ffd306bb1fb9740c9.tar.gz art-5d40f182181488eb39ccd19ffd306bb1fb9740c9.tar.bz2 | |
Fixes for "null instanceof" and class initialization
First issue was that the codegen seemed to expect r0 to contain 0 for
a false result in the null object case. This is a quick fix to make
that true. Given that the code is doing the work of a null check and
pulling out the object's class, the code should probably just pass the
class to the helper function, making this a case of IsAssignableFrom,
not instanceof.
Second issues were related to missing EnsureInitialized calls in two
different code paths, one coming from reflection, one coming from
managed code. New Class::AllocObject assert should help keep us out of
trouble in the future in this area, although perhaps Heap::AllocObject
should have a check as well.
Change-Id: Ib7975b6457481c1ac85135d38f42c6061e6443a0
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -156,7 +156,7 @@ test-art-target-oat-process-Calculator: $(TARGET_OUT_APPS)/Calculator.oat $(TARG # oatdump targets .PHONY: dump-oat -dump-oat: dump-oat-core dump-oat-boot +dump-oat: dump-oat-core dump-oat-boot dump-oat-Calculator .PHONY: dump-oat-core dump-oat-core: $(TARGET_CORE_OAT) $(OATDUMP) |