--- a/JavaResolver.st Sat Feb 02 01:23:18 2013 +0100
+++ b/JavaResolver.st Sat Feb 16 19:08:45 2013 +0100
@@ -1,11 +1,11 @@
"
COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
SWING Research Group, Czech Technical University in Prague
- Parts of the code written by Claus Gittinger are under following
- license:
-
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
inclusion of the above copyright notice. This software may not
@@ -13,31 +13,10 @@
other person. No title to or ownership of the software is
hereby transferred.
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
- of one of the above copright owners.
+ [1] Code written at SWING Research Group contains a signature
+ of one of the above copright owners. For exact set of such code,
+ see the differences between this version and version stx:libjava
+ as of 1.9.2010
"
"{ Package: 'stx:libjava' }"
@@ -53,12 +32,12 @@
copyright
"
COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
SWING Research Group, Czech Technical University in Prague
- Parts of the code written by Claus Gittinger are under following
- license:
-
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
inclusion of the above copyright notice. This software may not
@@ -66,31 +45,10 @@
other person. No title to or ownership of the software is
hereby transferred.
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
- of one of the above copright owners.
+ [1] Code written at SWING Research Group contains a signature
+ of one of the above copright owners. For exact set of such code,
+ see the differences between this version and version stx:libjava
+ as of 1.9.2010
"
! !
@@ -137,15 +95,20 @@
!
resolveClassIndentifiedByRef: aJavaClassRef init: doInit
- | classLoader result |
-
+ "marcel is back working harder then ever :)"
+
+ | result |
self validateClassRef: aJavaClassRef.
- result := self lookupClassIfAlreadyResolved: aJavaClassRef javaClassName.
-"/ result notNil ifTrue:[
-"/ "/wrap result with array(s) if needed and return it
-"/ "/FIXME: Marcel, can you have a look? Is that correct?
-"/ ^self checkIfArrayRef: aJavaClassRef andWrap: result
-"/ ].
+ JavaClassReader classLoaderQuerySignal answer: (aJavaClassRef classLoader)
+ do: [
+ result := self lookupClassIfAlreadyResolved: aJavaClassRef javaClassName.
+
+"/ result notNil ifTrue:[
+"/ "/wrap result with array(s) if needed and return it
+"/ "/FIXME: Marcel, can you have a look? Is that correct?
+"/ ^self checkIfArrayRef: aJavaClassRef andWrap: result.
+"/ ].
+ ].
"
To resolve an unresolved symbolic reference from D to a class or interface C denoted by N,
the following steps are performed:
@@ -154,117 +117,117 @@
of class or interface creation can thus be thrown as a result of failure of class and
interface resolution. The details of the process are given in Section 5.3.
"
- result isNil ifTrue:[
- classLoader := aJavaClassRef classLoader.
- classLoader isNil ifTrue: [
- result := self loadUnresolvedClass: aJavaClassRef
- ] ifFalse: [
- result := self loadUnresolvedClass: aJavaClassRef
- withJavaClassLoader: classLoader.
- ].
+ result isNil ifTrue: [
+ JavaClassReader classLoaderQuerySignal answer: (aJavaClassRef classLoader)
+ do: [
+ "#loadUnresolvedClass: wraps the class!!!!!!"
+ result := self loadUnresolvedClass: aJavaClassRef.
+ ((aJavaClassRef name first == $[) and: [ result isJavaArrayClass not ]) ifTrue: [
+ self breakPoint: #jv.
+ ]
+ ].
+ ] ifFalse: [ result := self checkIfArrayRef: aJavaClassRef andWrap: result. ].
+ result isNil ifTrue: [ self breakPoint: #mh ].
+ result isJavaPrimitiveType ifTrue: [
+ ^ self checkIfPrimitiveArrayRef: aJavaClassRef andWrap: result
].
- result ifNil: [ self breakPoint: #mh ].
-
- result isJavaPrimitiveType ifTrue: [
- ^ self checkIfPrimitiveArrayRef: aJavaClassRef andWrap: result
+ (doInit and: [ result isJavaClass and: [ result isJavaArrayClass not ] ]) ifTrue: [
+ result classInit
].
- doInit ifTrue:[result classInit].
"
If C is an array class and its element type is a reference type, then the symbolic reference
to the class or interface representing the element type is resolved by invoking the algorithm
- in Section 5.4.3.1 recursively."
- result := self checkIfArrayRef: aJavaClassRef andWrap: result.
- "Finally, access permissions to C are checked:
+ in Section 5.4.3.1 recursively.""Finally, access permissions to C are checked:
If C is not accessible (5.4.4) to D, class or interface resolution throws an IllegalAccessError.
This condition can occur, for example, if C is a class that was originally declared to be
public but was changed to be non-public after D was compiled.
If steps 1 and 2 succeed but step 3 fails, C is still valid and usable. Nevertheless, resolution
- fails, and D is prohibited from accessing C."
-
+ fails, and D is prohibited from accessing C."
- "JV@2011-08-10: HACK FOR SAXON DEMO!!!!!!"
- "(self checkPermissionsFrom: aJavaClassRef owner to: result)"true
- ifTrue: [ ^ result ]
- ifFalse: [ self throwIllegalAccessError ].
+ (self checkPermissionsFrom: aJavaClassRef owner to: result) ifFalse: [
+ self throwIllegalAccessError.
+ ^nil.
+ ].
+ ^result
"Created: / 11-04-2011 / 19:07:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 23-05-2011 / 21:11:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
"Created: / 12-08-2011 / 22:19:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (comment): / 03-10-2011 / 23:03:01 / m"
+ "Modified: / 01-12-2012 / 13:44:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-01-2013 / 15:29:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaResolver methodsFor:'class resolving helpers'!
-checkIfArrayRef: aJavaClassRef andWrap: result
- "/wrap result with array(s) if needed and return it
- ^ aJavaClassRef isJavaArrayClassRef
- ifFalse: [ result ]
- ifTrue: [ self wrapJavaClass: result withArrayAsSpecifiedIn: aJavaClassRef ]
+checkIfArrayRef: aJavaClassRef andWrap: nonArrayClass
+
+ "/wrap result with array(s) if needed and return it
+ | class|
+ class := nonArrayClass.
+ aJavaClassRef name do:[:c|
+ c ~~ $[ ifTrue:[ ^ class ].
+ class := class javaArrayClass.
+ ].
+ ^class
"Modified: / 11-04-2011 / 19:31:43 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-10-2011 / 23:46:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-checkPermissionsFrom: refOwner to: resolvedClass
- "
- A class or interface C is accessible to a class or interface D if and only if either of the following conditions are true:
- C is public.
- C and D are members of the same runtime package (§5.3).
- Finally, access permissions to C are checked:
- If C is not accessible (§5.4.4) to D, class or interface resolution throws an IllegalAccessError.
- This condition can occur, for example, if C is a class that was originally declared to be
- public but was changed to be non-public after D was compiled.
- At run time, a class or interface is determined not by its name alone,
- but by a pair: its fully qualified name and its defining class loader.
- Each such class or interface belongs to a single runtime package. The runtime
- package of a class or interface is determined by the package name and
- defining class loader of the class or interface."
+checkPermissionsFrom: refOwner to: resolvedClass
+ refOwner hasMagicAccessRights ifTrue: [ ^ true ].
+ (JavaDescriptor isJavaPrimitiveArrayName: resolvedClass javaName) ifTrue: [
+ ^ true
+ ].
+ resolvedClass isPublic ifTrue: [ ^ true ].
+ resolvedClass classLoader = refOwner classLoader ifFalse: [ ^ false. ].
+ refOwner javaPackage = resolvedClass javaPackage ifTrue: [ ^ true ].
- resolvedClass isPublic ifTrue: [ ^ true ].
- resolvedClass classLoader = refOwner classLoader ifFalse: [ ^ false ].
- ^ refOwner javaPackage = resolvedClass javaPackage.
+ "/a little bit too verbose here just so it's clear what's in query
+
+ JavaVM privilegedAccessQuery query ifTrue: [ ^ true ] ifFalse: [ ^ false ].
"Created: / 11-04-2011 / 19:35:21 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 13-04-2011 / 23:13:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified (comment): / 09-10-2011 / 23:11:54 / Marcel Hlopko <hlopik@gmail.com>"
+ "Modified: / 23-08-2012 / 20:21:40 / m"
+ "Modified: / 30-11-2012 / 20:34:26 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
loadUnresolvedClass: aJavaClassRef
- | nm |
+ | nm cls i |
- nm := aJavaClassRef javaClassName.
- nm size == 1
- and: [ JavaDescriptor baseTypes at: nm first ifPresent: [:cls | ^ cls ] ].
- ^ Java classForName: aJavaClassRef javaClassName.
+ nm := aJavaClassRef name.
+ nm size == 1 ifTrue:[
+ JavaDescriptor baseTypes at: nm first ifPresent: [:cls | ^ cls ]
+ ].
+ "Note, that JavaVM>>classForName: itself deals with class loaders.
+ The caller of me should set one using code like:
+
+ JavaClassReader classLoaderQuerySignal answer: loader do:[call me]
+ "
+ cls := JavaVM classForName: nm.
+ (nm startsWith:$[) ifTrue:[
+ i := 1.
+ [ (nm at:i) == $[ ] whileTrue:[
+ cls := cls javaArrayClass.
+ i := i + 1.
+ ].
+ self assert: (nm at:i) == $L.
+ ].
+
+ ^cls.
"Created: / 11-04-2011 / 19:27:10 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 22-05-2011 / 17:58:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 23-05-2011 / 21:06:25 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-loadUnresolvedClass: aJavaClassRef withJavaClassLoader: classLoader
- | jClass clc |
-
- "JV@2011-08-12: HACK HACK HACK!!!!!!"
- (clc := Java at:'java.lang.ClassLoader') notNil ifTrue:[
- (classLoader == (clc instVarNamed: #scl)) ifTrue:[
- ^self loadUnresolvedClass: aJavaClassRef
- ]
- ].
-
- jClass := classLoader
- perform: #'loadClass(Ljava/lang/String;)Ljava/lang/Class;'
- with: (Java as_String: (aJavaClassRef name)).
- ^JavaVM reflection classForJavaClassObject: jClass.
-
- "Modified: / 18-05-2011 / 14:52:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 12-08-2011 / 09:14:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 29-02-2012 / 09:20:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
lookupClassIfAlreadyResolved: javaClassName
-
- ^Java at: javaClassName
+ ^ JavaVM classNamed: javaClassName
- "Modified: / 13-04-2011 / 14:05:25 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
"Modified: / 06-08-2011 / 16:44:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 21-10-2011 / 13:40:52 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
validateClassRef: aJavaClassRef
@@ -272,22 +235,6 @@
self assert: aJavaClassRef isJavaClassRef .
"Modified: / 23-05-2011 / 21:04:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-wrapJavaClass:aJavaClass withArrayAsSpecifiedIn:aJavaClassRef
- "wraps aJavaClass with as many array dimensions as needed (zero means no array)"
-
- |arrayClass|
-
- aJavaClassRef isJavaArrayClassRef ifFalse:[ ^ aJavaClass ].
- aJavaClassRef arrayDimensions timesRepeat:
- [ arrayClass := aJavaClass.
- arrayClass := arrayClass javaArrayClass. ].
- ^ arrayClass.
-
- "Created: / 08-04-2011 / 18:40:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 22-05-2011 / 17:48:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 23-05-2011 / 21:06:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaResolver methodsFor:'common helpers'!
@@ -296,7 +243,7 @@
"A class or interface C is accessible to a class or interface D if
and only if either of the following conditions are true:
C is public.
- C and D are members of the same runtime package (§5.3).
+ C and D are members of the same runtime package (§5.3).
A field or method R is accessible to a class or interface D if and only
if any of the following conditions is true:
R is public.
@@ -309,14 +256,15 @@
This discussion of access control omits a related restriction on the target
of a protected field access or method invocation (the target must be of class
D or a subtype of D). That requirement is checked as part of the verification
- process (§5.4.1); it is not part of link-time access control."
-
+ process (§5.4.1); it is not part of link-time access control."
+
+ accessingJavaClass hasMagicAccessRights ifTrue: [ ^true ].
+
(self checkPermissionsFrom: accessingJavaClass to: resolvedJavaClass) ifFalse: [
+ JavaVM privilegedAccessQuery query ifTrue: [ ^ true ].
^ false
].
- aJavaMethodOrField isPublic ifTrue: [
- ^ true
- ].
+ aJavaMethodOrField isPublic ifTrue: [ ^ true ].
((aJavaMethodOrField isProtected
and: [
resolvedJavaClass javaComponentClass
@@ -334,10 +282,14 @@
(aJavaMethodOrField isPrivate
and: [ aJavaMethodOrField javaClass name = accessingJavaClass name ])
ifTrue: [ ^ true ].
- ^ false.
+
+ "/a little bit too verbose here just so it's clear what's in query
+
+ JavaVM privilegedAccessQuery query ifTrue: [ ^ true ] ifFalse: [ ^ false ].
"Created: / 14-04-2011 / 14:19:33 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 04-06-2011 / 20:49:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified (comment): / 09-10-2011 / 23:12:48 / Marcel Hlopko <hlopik@gmail.com>"
+ "Modified: / 18-11-2012 / 16:24:29 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaResolver methodsFor:'exceptions'!
@@ -381,12 +333,11 @@
resolveFieldIndentifiedByRef: aJavaFieldRef
| result class |
-
self validateFieldRef: aJavaFieldRef.
result := self lookupFieldIfAlreadyResolved: aJavaFieldRef.
result ifNotNil: [ ^ result ].
- class := aJavaFieldRef classRef resolve.
- class ifNil: [ self halt: 'should not happen - tell mh' ].
+ class := aJavaFieldRef classRef resolve: false.
+ class ifNil: [ self error: 'should not happen - tell mh' ].
result := class lookupFieldByNameAndType: aJavaFieldRef nameAndType.
result ifNil: [ self throwNoSuchFieldException ].
(self
@@ -425,17 +376,16 @@
impose the loading constraint that TL1=TL2(§5.3.4)."
"Created: / 11-04-2011 / 21:15:20 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 13-04-2011 / 11:57:24 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 01-12-2012 / 13:45:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
resolveStaticFieldIndentifiedByRef: aJavaFieldRef
| result class |
-
self validateFieldRef: aJavaFieldRef.
result := self lookupFieldIfAlreadyResolved: aJavaFieldRef.
result ifNotNil: [ ^ result ].
- class := aJavaFieldRef classRef resolve.
- class ifNil: [ self halt: 'should not happen - tell mh' ].
+ class := aJavaFieldRef classRef resolve: false.
+ class ifNil: [ self error: 'should not happen - tell mh' ].
result := class lookupStaticFieldByNameAndType: aJavaFieldRef nameAndType.
result ifNil: [ self throwNoSuchFieldException ].
(self
@@ -474,34 +424,19 @@
impose the loading constraint that TL1=TL2(§5.3.4)."
"Created: / 28-04-2011 / 22:31:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 01-12-2012 / 13:45:45 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaResolver methodsFor:'field resolving helpers'!
-checkPermissionsForField: aJavaField from: accessingJavaClass to: resolvedJavaClass
- "A class or interface C is accessible to a class or interface D if and only
- if either of the following conditions are true:
- C is public.
- C and D are members of the same runtime package (5.3).
- A field or method R is accessible to a class or interface D if and only
- if any of the following conditions is true:
- R is public.
- R is protected and is declared in a class C, and D is either a subclass of
- C or C itself.
- R is either protected or package private (that is, neither public nor protected
- nor private), and is declared by a class in the same runtime package as D.
- R is private and is declared in D.
- This discussion of access control omits a related restriction on the target of
- a protected field access or method invocation (the target must be of class D or
- a subtype of D). That requirement is checked as part of the verification process
- (5.4.1); it is not part of link-time access control."
-
+checkPermissionsForField: aJavaField from: accessingJavaClass to: resolvedJavaClass
^ self
- checkPermissionsForMethodOrField: aJavaField from: accessingJavaClass
+ checkPermissionsForMethodOrField: aJavaField
+ from: accessingJavaClass
to: resolvedJavaClass.
"Created: / 11-04-2011 / 21:46:29 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 14-04-2011 / 14:21:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 01-12-2012 / 13:45:55 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
lookupFieldIfAlreadyResolved: aJavaFieldRef
@@ -512,33 +447,36 @@
!
validateFieldRef: aJavaFieldRef
- aJavaFieldRef isJavaRef ifFalse:[self halt:'I expected Java Ref'].
- aJavaFieldRef isJavaFieldRef ifFalse:[self halt:'I expected Java Field Ref'].
+ aJavaFieldRef isJavaRef ifFalse: [ self halt: 'I expected Java Ref' ].
+ aJavaFieldRef isJavaFieldRef ifFalse: [
+ self error: 'I expected Java Field Ref'
+ ].
"Created: / 11-04-2011 / 21:16:44 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 01-12-2012 / 13:46:02 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaResolver methodsFor:'interface method resolving'!
resolveInterfaceMethodIdentifiedByRef: aJavaInterfaceMethodRef
| result class |
-
self validateInterfaceMethodRef: aJavaInterfaceMethodRef.
result := self
- lookupInterfaceMethodIfAlreadyResolved: aJavaInterfaceMethodRef.
+ lookupInterfaceMethodIfAlreadyResolved: aJavaInterfaceMethodRef.
result ifNotNil: [ ^ result ].
- class := aJavaInterfaceMethodRef classRef resolve.
- class ifNil: [ self halt: 'should not happen - tell mh' ].
+ class := aJavaInterfaceMethodRef classRef resolve: false.
+ class ifNil: [ self error: 'should not happen - tell mh' ].
class isInterface ifFalse: [ self throwIncompatibleClassChangeError ].
result := class
- lookupMethodByNameAndType: aJavaInterfaceMethodRef nameAndType.
+ lookupMethodByNameAndType: aJavaInterfaceMethodRef nameAndType.
result ifNil: [ self throwNoSuchMethodError ].
(self
checkPermissionsForMethod: result
from: aJavaInterfaceMethodRef classRef owner
to: class) ifFalse: [ self throwIllegalAccessError ].
-^ result.
- "
+ ^ result.
+
+ "
To resolve an unresolved symbolic reference from D to an interface method in an
interface C, the symbolic reference to C given by the interface method reference is
first resolved (§5.4.3.1). Therefore, any exceptions that can be thrown as a result
@@ -547,17 +485,18 @@
resolved, exceptions relating to the resolution of the interface method reference
itself can be thrown.
When resolving an interface method reference:
-
- If C is not an interface, interface method resolution throws an IncompatibleClassChangeError.""Otherwise, if the referenced method does not have the same name and descriptor as
- a method in C or in one of the superinterfaces of C, or in class Object, interface
- method resolution throws a NoSuchMethodError.
- Otherwise, let <E, L1> be the interface in which the referenced interface method is
- actually declared and let L2 be the defining loader of D. Let T0 be the name of
- the type returned by the referenced method, and let T1, ..., Tn be the names of the
- argument types of the referenced method. The Java virtual machine must impose the
- loading constraints TiL1 = TiL2 for i = 0 to n (§5.3.4)."
- "Modified: / 23-05-2011 / 17:56:24 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ If C is not an interface, interface method resolution throws an IncompatibleClassChangeError."
+ "Otherwise, if the referenced method does not have the same name and descriptor as
+a method in C or in one of the superinterfaces of C, or in class Object, interface
+method resolution throws a NoSuchMethodError.
+Otherwise, let <E, L1> be the interface in which the referenced interface method is
+actually declared and let L2 be the defining loader of D. Let T0 be the name of
+the type returned by the referenced method, and let T1, ..., Tn be the names of the
+argument types of the referenced method. The Java virtual machine must impose the
+loading constraints TiL1 = TiL2 for i = 0 to n (§5.3.4)."
+
+ "Modified: / 01-12-2012 / 13:46:09 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaResolver methodsFor:'interface method resolving helpers'!
@@ -569,34 +508,34 @@
!
validateInterfaceMethodRef: aJavaInterfaceMethodRef
- aJavaInterfaceMethodRef isJavaRef
- ifFalse: [ self halt: 'I expected JavaRef instance as an argument' ].
- aJavaInterfaceMethodRef isJavaInterfaceMethodRef
- ifFalse: [ self halt: 'I expected JavaMethodRef instance as an argument' ].
+ aJavaInterfaceMethodRef isJavaRef ifFalse: [
+ self error: 'I expected JavaRef instance as an argument'
+ ].
+ aJavaInterfaceMethodRef isJavaInterfaceMethodRef ifFalse: [
+ self error: 'I expected JavaMethodRef instance as an argument'
+ ].
"Created: / 13-04-2011 / 11:53:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 01-12-2012 / 13:46:20 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaResolver methodsFor:'method resolving'!
resolveMethodIndentifiedByRef: aJavaMethodRef
| result class |
-
self validateMethodRef: aJavaMethodRef.
result := self lookupMethodIfAlreadyResolved: aJavaMethodRef.
result ifNotNil: [ ^ result ].
- class := aJavaMethodRef classRef resolve.
+ class := aJavaMethodRef classRef resolve: false.
class ifNil: [ self error: 'should not happen - tell mh' ].
- "Array types responds to all method of class java.lang.Object"
- class isJavaArrayClass ifTrue:[
- class := Java classForName:'java.lang.Object'.
+ "Array types responds to all method of class java.lang.Object"
+ class isJavaArrayClass ifTrue: [
+ class := JavaVM classForName: 'java.lang.Object'.
].
-
-
"
To resolve an unresolved symbolic reference from D to a method in
a class C, the symbolic reference to C given by the method reference
- is first resolved (§5.4.3.1). Therefore, any exceptions that can be
+ is first resolved (§5.4.3.1). Therefore, any exceptions that can be
thrown due to resolution of a class reference can be thrown as a result
of method resolution. If the reference to C can be successfully resolved,
exceptions relating to the resolution of the method reference itself
@@ -621,70 +560,12 @@
If method lookup fails, method resolution throws a NoSuchMethodError. If method
lookup succeeds and the method is abstract, but C is not abstract, method resolution
throws an AbstractMethodError. Otherwise, if the referenced method is not accessible
- (§5.4.4) to D, method resolution throws an IllegalAccessError."
+ (§5.4.4) to D, method resolution throws an IllegalAccessError."
result := class lookupMethodByNameAndType: aJavaMethodRef nameAndType.
result ifNil: [ self throwNoSuchMethodError ].
- (result isAbstract and:[result javaClass isInterface not and:[ class isAbstract not ]])
- ifTrue: [ self throwAbstractMethodError ].
- true "FIXME does not work with saxon demo - q&d hack t make esug demo work" "(self
- checkPermissionsForMethod: result
- from: aJavaMethodRef classRef owner
- to: class)" ifFalse: [ self throwIllegalAccessError ].
- ^ result.
-
- "Otherwise, let <E, L1> be the class or interface in which the referenced method is
- actually declared and let L2 be the defining loader of D. Let T0 be the name of
- the type returned by the referenced method, and let T1, ..., Tn be the names of
- the argument types of the referenced method. The Java virtual machine must impose
- the loading constraints TiL1=TiL2 for i = 0 to n (§5.3.4)."
-
- "Created: / 11-04-2011 / 19:45:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 14-04-2011 / 00:01:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-08-2011 / 22:44:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 19-08-2011 / 14:33:56 / cg"
-!
-
-resolveStaticMethodIndentifiedByRef: aJavaMethodRef
- | result class |
-
- self validateMethodRef: aJavaMethodRef.
- result := self lookupMethodIfAlreadyResolved: aJavaMethodRef.
- result ifNotNil: [ ^ result ].
- class := aJavaMethodRef classRef resolve.
- class ifNil: [ self halt: 'should not happen - tell mh' ].
- "
- To resolve an unresolved symbolic reference from D to a method in
- a class C, the symbolic reference to C given by the method reference
- is first resolved (§5.4.3.1). Therefore, any exceptions that can be
- thrown due to resolution of a class reference can be thrown as a result
- of method resolution. If the reference to C can be successfully resolved,
- exceptions relating to the resolution of the method reference itself
- can be thrown.
- When resolving a method reference:
-
- Method resolution checks whether C is a class or an interface.
- If C is an interface, method resolution throws an IncompatibleClassChangeError."
- class isInterface ifTrue: [ self throwIncompatibleClassChangeError ].
- "Method resolution attempts to look up the referenced method in C and its
- superclasses:
- If C declares a method with the name and descriptor specified by the method
- reference, method lookup succeeds.
- Otherwise, if C has a superclass, step 2 of method lookup is recursively
- invoked on the direct superclass of C.
-
- Otherwise, method lookup attempts to locate the referenced method in any of
- the superinterfaces of the specified class C.
- If any superinterface of C declares a method with the name and descriptor
- specified by the method reference, method lookup succeeds.
- Otherwise, method lookup fails.
- If method lookup fails, method resolution throws a NoSuchMethodError. If method
- lookup succeeds and the method is abstract, but C is not abstract, method resolution
- throws an AbstractMethodError. Otherwise, if the referenced method is not accessible
- (§5.4.4) to D, method resolution throws an IllegalAccessError."
- result := class lookupStaticMethodByNameAndType: aJavaMethodRef nameAndType.
- result ifNil: [ self throwNoSuchMethodError ].
- (result isAbstract and: [ class isAbstract not ])
- ifTrue: [ self throwAbstractMethodError ].
+ (result isAbstract
+ and: [ result javaClass isInterface not and: [ class isAbstract not ] ])
+ ifTrue: [ self throwAbstractMethodError ].
(self
checkPermissionsForMethod: result
from: aJavaMethodRef classRef owner
@@ -695,41 +576,26 @@
actually declared and let L2 be the defining loader of D. Let T0 be the name of
the type returned by the referenced method, and let T1, ..., Tn be the names of
the argument types of the referenced method. The Java virtual machine must impose
- the loading constraints TiL1=TiL2 for i = 0 to n (§5.3.4)."
+ the loading constraints TiL1=TiL2 for i = 0 to n (§5.3.4)."
- "Created: / 28-04-2011 / 22:50:04 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Created: / 11-04-2011 / 19:45:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 14-04-2011 / 00:01:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 10-08-2011 / 22:44:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (format): / 01-12-2012 / 13:46:25 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaResolver methodsFor:'method resolving helpers'!
-checkPermissionsForMethod: aJavaMethod from: accessingJavaClass to: resolvedJavaClass
- "A class or interface C is accessible to a class or interface D if
- and only if either of the following conditions are true:
- C is public.
- C and D are members of the same runtime package (§5.3).
- A field or method R is accessible to a class or interface D if and only
- if any of the following conditions is true:
- R is public.
- R is protected and is declared in a class C, and D is either a subclass
- of C or C itself.
- R is either protected or package private (that is, neither public nor
- protected nor private), and is declared by a class in the same runtime
- package as D.
- R is private and is declared in D.
- This discussion of access control omits a related restriction on the target
- of a protected field access or method invocation (the target must be of class
- D or a subtype of D). That requirement is checked as part of the verification
- process (§5.4.1); it is not part of link-time access control."
-
- "JV@2011-05-24: Temporary hack, since access checking
- is somewhat broken. Marcle should fix it :-)"
- OperatingSystem getLoginName = 'jv' ifTrue:[^true].
-
- ^ self checkPermissionsForMethodOrField: aJavaMethod from: accessingJavaClass to: resolvedJavaClass.
+checkPermissionsForMethod: aJavaMethod from: accessingJavaClass to: resolvedJavaClass
+ ^ self
+ checkPermissionsForMethodOrField: aJavaMethod
+ from: accessingJavaClass
+ to: resolvedJavaClass.
"Created: / 11-04-2011 / 20:20:12 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 14-04-2011 / 14:20:27 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
"Modified: / 24-05-2011 / 14:06:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 09-02-2012 / 23:15:48 / mh <hlopik@gmail.com>"
+ "Modified: / 01-12-2012 / 13:46:58 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
lookupMethodIfAlreadyResolved: aJavaMethodRef
@@ -740,24 +606,31 @@
!
validateMethodRef: aJavaMethodRef
- aJavaMethodRef isJavaRef ifFalse:[self halt: 'I expected JavaRef instance as an argument'].
- aJavaMethodRef isJavaMethodRef ifFalse: [self halt: 'I expected JavaMethodRef instance as an argument'].
+ aJavaMethodRef isJavaRef ifFalse: [
+ self error: 'I expected JavaRef instance as an argument'
+ ].
+ aJavaMethodRef isJavaMethodRef ifFalse: [
+ self error: 'I expected JavaMethodRef instance as an argument'
+ ].
"Created: / 11-04-2011 / 19:47:25 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 01-12-2012 / 13:47:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaResolver class methodsFor:'documentation'!
-version
- ^ '$Header: /cvs/stx/stx/libjava/JavaResolver.st,v 1.3 2011-11-24 11:24:31 cg Exp $'
+version_CVS
+ ^ '$Header: /cvs/stx/stx/libjava/JavaResolver.st,v 1.4 2013-02-16 18:08:32 vrany Exp $'
!
-version_CVS
- ^ '$Header: /cvs/stx/stx/libjava/JavaResolver.st,v 1.3 2011-11-24 11:24:31 cg Exp $'
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ '§Id: JavaResolver.st,v 1.1 2011/08/18 19:06:53 vrany Exp §'
+ ^ '§Id§'
! !
+
JavaResolver initialize!