OSDN Git Service

x86 mterp: fix cherry-pick/merge, issue 3095771
authorbuzbee <buzbee@google.com>
Thu, 14 Oct 2010 00:47:52 +0000 (17:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 Oct 2010 19:00:50 +0000 (12:00 -0700)
commitef1ed3c5cbde4de64e1991de2dbea57efd964841
treef97eb3ed819db74c12f0e3f468f094291683e3cc
parentf4b26ea7ea0a85e2592a0ec0e439ffa4f3c5a038
x86 mterp: fix cherry-pick/merge, issue 3095771

Bug http://b/issue?id=3095771

Change
https://android-git.corp.google.com/g/#change,70700
was a cherry-pick/merge of
https://android-git.corp.google.com/g/#change,70388

It was not properly merged, and resulting in the register holding
the object head to be trashed (and subsequently broke GC).

Change-Id: Ic480104e3a643a5b744d36eb0aefaedd3e4f925c
vm/mterp/out/InterpAsm-x86.S
vm/mterp/x86/OP_APUT_OBJECT.S