Merge sFields and iFields.

Test: test.py

Change-Id: Ib97fca637a8866a41a4389b150c6000d9fb6d99b

1 files changed, 3 insertions, 3 deletions

diff --git a/compiler/driver/dex_compilation_unit.cc b/compiler/driver/dex_compilation_unit.cc
index ccebfa9c07..fc139aa000 100644
--- a/compiler/driver/dex_compilation_unit.cc
+++ b/compiler/driver/dex_compilation_unit.cc
@@ -67,9 +67,9 @@ bool DexCompilationUnit::RequiresConstructorBarrier() const {
     // Decoding class data can be slow, so iterate over fields of the compiling class if resolved.
     ScopedObjectAccess soa(Thread::Current());
     ObjPtr<mirror::Class> compiling_class = GetCompilingClass().Get();
-    for (size_t i = 0, size = compiling_class->NumInstanceFields(); i != size; ++i) {
-      ArtField* field = compiling_class->GetInstanceField(i);
-      if (field->IsFinal()) {
+    for (size_t i = 0, size = compiling_class->NumFields(); i != size; ++i) {
+      ArtField* field = compiling_class->GetField(i);
+      if (field->IsFinal() && !field->IsStatic()) {
         return true;
       }
     }