harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r573303 - in /harmony/enhanced/drlvm/trunk: build/custom/msvc_2003/vmcore/vmcore.vcproj vm/vmcore/src/verifier-3363/vf_resolve.cpp
Date Thu, 06 Sep 2007 15:55:07 GMT
Author: gshimansky
Date: Thu Sep  6 08:55:07 2007
New Revision: 573303

URL: http://svn.apache.org/viewvc?rev=573303&view=rev
Log:
Applied patch from HARMONY-4738
[drlvm][verifier] Eclipse 3.3 fails on recent Harmony with verify error


Modified:
    harmony/enhanced/drlvm/trunk/build/custom/msvc_2003/vmcore/vmcore.vcproj
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/vf_resolve.cpp

Modified: harmony/enhanced/drlvm/trunk/build/custom/msvc_2003/vmcore/vmcore.vcproj
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/custom/msvc_2003/vmcore/vmcore.vcproj?rev=573303&r1=573302&r2=573303&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/custom/msvc_2003/vmcore/vmcore.vcproj (original)
+++ harmony/enhanced/drlvm/trunk/build/custom/msvc_2003/vmcore/vmcore.vcproj Thu Sep  6 08:55:07
2007
@@ -1284,6 +1284,40 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="cp_verifier"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier-3363\context.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier-3363\instr_props.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier-3363\Pass1.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier-3363\Pass2.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier-3363\stackmap.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier-3363\tpool.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier-3363\tpool.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier-3363\Ver.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier-3363\ver_utils.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier-3363\vf_resolve.cpp">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/vf_resolve.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/vf_resolve.cpp?rev=573303&r1=573302&r2=573303&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/vf_resolve.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/vf_resolve.cpp Thu Sep  6 08:55:07
2007
@@ -77,25 +77,12 @@
         const char *name,         // resolved class name
         bool need_load)      // load flag
     {
+		// get class loader
+		classloader_handler class_loader = class_get_class_loader( k_class );
         if( need_load ) {
-            return cl_load_class( class_get_class_loader( k_class ), name );
+            return cl_load_class( class_loader, name );
         } else {
-            // get class loader
-            classloader_handler class_loader = 0;
-            class_handler sup = k_class;
-
-            while( sup ) {
-                classloader_handler class_loader2 = class_get_class_loader( sup );
-                if( class_loader != class_loader2 ) {
-                    class_loader = class_loader2;
-                    class_handler result = cl_get_class( class_loader, name );
-                    if( result ) {
-                        return result;
-                    }
-                }
-                sup = class_get_super_class(sup);
-            }
-            return 0;
+            return cl_get_class( class_loader, name );
         }
     } // vf_resolve_class
 



Mime
View raw message