harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r574955 - in /harmony/enhanced/drlvm/trunk: build/make/excludes/ vm/jitrino/src/codegenerator/ia32/
Date Wed, 12 Sep 2007 13:29:56 GMT
Author: varlax
Date: Wed Sep 12 06:29:55 2007
New Revision: 574955

URL: http://svn.apache.org/viewvc?rev=574955&view=rev
Log:
Fixed HARMONY-4767 [drlvm][jit] assertion in OPT on kernel java/lang/ClassAnnotationsTest

Modified:
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.opt
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.srv
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.srv
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp

Modified: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.opt
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.opt?rev=574955&r1=574954&r2=574955&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.opt (original)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.opt Wed
Sep 12 06:29:55 2007
@@ -9,5 +9,3 @@
 java/lang/RuntimeAdditionalTest41.java
 java/lang/RuntimeAdditionalTest42.java
 
-# HARMONY-4767
-java/lang/ClassAnnotationsTest.java

Modified: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.srv
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.srv?rev=574955&r1=574954&r2=574955&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.srv (original)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.srv Wed
Sep 12 06:29:55 2007
@@ -9,5 +9,3 @@
 java/lang/RuntimeAdditionalTest41.java
 java/lang/RuntimeAdditionalTest42.java
 
-# HARMONY-4767
-java/lang/ClassAnnotationsTest.java

Modified: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt?rev=574955&r1=574954&r2=574955&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt
(original)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt
Wed Sep 12 06:29:55 2007
@@ -9,5 +9,3 @@
 java/lang/RuntimeAdditionalTest41.java
 java/lang/RuntimeAdditionalTest42.java
 
-# HARMONY-4767
-java/lang/ClassAnnotationsTest.java

Modified: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.srv
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.srv?rev=574955&r1=574954&r2=574955&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.srv
(original)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.srv
Wed Sep 12 06:29:55 2007
@@ -9,5 +9,3 @@
 java/lang/RuntimeAdditionalTest41.java
 java/lang/RuntimeAdditionalTest42.java
 
-# HARMONY-4767
-java/lang/ClassAnnotationsTest.java

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp?rev=574955&r1=574954&r2=574955&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp Wed Sep 12
06:29:55 2007
@@ -140,9 +140,9 @@
     Opnd* base = getMemOpndSubOpnd(MemOpndSubOpndKind_Base);
     Opnd* disp = getMemOpndSubOpnd(MemOpndSubOpndKind_Displacement);
     if (base != NULL && base->isPlacedIn(OpndKind_Imm)) {
-        assert(disp == NULL || !disp->isPlacedIn(OpndKind_Imm));
+        assert(disp == NULL || !disp->isPlacedIn(OpndKind_Imm) || base->getType()->isNullObject());
+        setMemOpndSubOpnd(MemOpndSubOpndKind_Displacement, base);
         // can't call setMemOpndSubOpnd() as it fights against zero opnd.
-        memOpndSubOpnds[MemOpndSubOpndKind_Displacement] = base;//== setMemOpndSubOpnd(MemOpndSubOpndKind_Displacement,
base);
         memOpndSubOpnds[MemOpndSubOpndKind_Base] = disp; //==setMemOpndSubOpnd(MemOpndSubOpndKind_Base,
disp);
     }
 }



Mime
View raw message