author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Thu, 27 Sep 2018 23:09:30 +0100 | |
changeset 3854 | 193b04caef42 |
parent 3660 | 5b1f89d1b991 |
permissions | -rw-r--r-- |
749 | 1 |
" |
3324
a58245c0e83a
Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3235
diff
changeset
|
2 |
COPYRIGHT (c) 1996-2015 by Claus Gittinger |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
3 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
4 |
New code and modifications done at SWING Research Group [1]: |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
5 |
|
3324
a58245c0e83a
Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3235
diff
changeset
|
6 |
COPYRIGHT (c) 2010-2015 by Jan Vrany, Jan Kurs and Marcel Hlopko |
749 | 7 |
SWING Research Group, Czech Technical University in Prague |
8 |
||
9 |
This software is furnished under a license and may be used |
|
10 |
only in accordance with the terms of that license and with the |
|
11 |
inclusion of the above copyright notice. This software may not |
|
12 |
be provided or otherwise made available to, or used by, any |
|
13 |
other person. No title to or ownership of the software is |
|
14 |
hereby transferred. |
|
15 |
||
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
16 |
[1] Code written at SWING Research Group contains a signature |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
17 |
of one of the above copright owners. For exact set of such code, |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
18 |
see the differences between this version and version stx:libjava |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
19 |
as of 1.9.2010 |
749 | 20 |
" |
21 |
"{ Package: 'stx:libjava' }" |
|
22 |
||
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
23 |
JavaClassMemberRef2 subclass:#JavaFieldRef2 |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
24 |
instanceVariableNames:'resolvedOffset' |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
25 |
classVariableNames:'' |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
26 |
poolDictionaries:'JavaConstants' |
749 | 27 |
category:'Languages-Java-Reader-Support-new' |
28 |
! |
|
29 |
||
30 |
!JavaFieldRef2 class methodsFor:'documentation'! |
|
31 |
||
32 |
copyright |
|
33 |
" |
|
3324
a58245c0e83a
Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3235
diff
changeset
|
34 |
COPYRIGHT (c) 1996-2015 by Claus Gittinger |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
35 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
36 |
New code and modifications done at SWING Research Group [1]: |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
37 |
|
3324
a58245c0e83a
Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3235
diff
changeset
|
38 |
COPYRIGHT (c) 2010-2015 by Jan Vrany, Jan Kurs and Marcel Hlopko |
749 | 39 |
SWING Research Group, Czech Technical University in Prague |
40 |
||
41 |
This software is furnished under a license and may be used |
|
42 |
only in accordance with the terms of that license and with the |
|
43 |
inclusion of the above copyright notice. This software may not |
|
44 |
be provided or otherwise made available to, or used by, any |
|
45 |
other person. No title to or ownership of the software is |
|
46 |
hereby transferred. |
|
47 |
||
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
48 |
[1] Code written at SWING Research Group contains a signature |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
49 |
of one of the above copright owners. For exact set of such code, |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
50 |
see the differences between this version and version stx:libjava |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
51 |
as of 1.9.2010 |
749 | 52 |
|
53 |
" |
|
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
54 |
! |
749 | 55 |
|
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
56 |
documentation |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
57 |
" |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
58 |
A symbolic reference to a field. |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
59 |
|
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
60 |
[author:] |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
61 |
Marcel Hlopko <marcel.hlopko@fit.cvut.cz> |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
62 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
749 | 63 |
|
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
64 |
[instance variables:] |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
65 |
!! resolvedOffset ...... once resolved, this slot contains physical offset |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
66 |
of the field within an instance (if instance field) |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
67 |
or of the static field withing a class instance |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
68 |
(if static field). |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
69 |
!!!!!! Used by the VM !!!!!! |
749 | 70 |
|
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
71 |
[class variables:] |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
72 |
|
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
73 |
[see also:] |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
74 |
|
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
75 |
" |
749 | 76 |
! ! |
77 |
||
78 |
!JavaFieldRef2 methodsFor:'accessing'! |
|
79 |
||
80 |
isJavaFieldRef |
|
81 |
^true. |
|
82 |
||
83 |
"Created: / 11-04-2011 / 21:47:51 / Marcel Hlopko <hlopkmar@fel.cvut.cz>" |
|
84 |
! |
|
85 |
||
86 |
offset |
|
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
87 |
^ resolvedOffset. |
749 | 88 |
|
89 |
"Created: / 15-05-2011 / 22:26:08 / Marcel Hlopko <hlopkmar@fel.cvut.cz>" |
|
90 |
! |
|
91 |
||
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
92 |
resolvedOffset |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
93 |
^ resolvedOffset. |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
94 |
|
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
95 |
"Created: / 31-01-2014 / 09:15:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
96 |
! |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
97 |
|
749 | 98 |
type |
99 |
^ type. |
|
100 |
||
101 |
"Created: / 15-05-2011 / 22:29:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>" |
|
2799
b2fa940b8184
Fixed tests JavaFieldRefTests>>testCorrectResolving
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
102 |
"Modified: / 05-10-2013 / 23:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
749 | 103 |
! ! |
104 |
||
3235 | 105 |
!JavaFieldRef2 methodsFor:'printing & storing'! |
106 |
||
107 |
printOn:aStream |
|
108 |
super printOn: aStream. |
|
109 |
aStream nextPut: $(. |
|
110 |
self classRef javaClassName printOn: aStream. |
|
111 |
aStream nextPut:$#. |
|
112 |
aStream nextPutAll: self nameAndType name. |
|
113 |
aStream nextPut: $). |
|
114 |
||
115 |
"Modified: / 15-08-2014 / 15:30:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
116 |
! ! |
|
117 |
||
749 | 118 |
!JavaFieldRef2 methodsFor:'private - resolving'! |
119 |
||
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
120 |
findInstOffset |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
121 |
"fieldRef must be resolved before calling me" |
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
122 |
self assert: resolvedClass notNil. |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
123 |
self assert: resolvedValue notNil. |
3660
5b1f89d1b991
Cleanup: use `#instVarIndexFor:` rather than `#instVarOffsetOf:`
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3412
diff
changeset
|
124 |
^ resolvedClass instVarIndexFor: self name. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
125 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
126 |
"Created: / 07-12-2011 / 13:44:59 / Marcel Hlopko <hlopkmar@fel.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
127 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
128 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
129 |
findResolvedValue: doClassInit |
2748
fa96e547c9a5
set cleanCacheFlag in JavaFieldRef when multiple java class versions present
Marcel Hlopko <marcel.hlopko@gmail.com>
parents:
2711
diff
changeset
|
130 |
" |
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
131 |
Stores resolved field in valueCache field, fills offset and |
2820 | 132 |
type fields. |
2748
fa96e547c9a5
set cleanCacheFlag in JavaFieldRef when multiple java class versions present
Marcel Hlopko <marcel.hlopko@gmail.com>
parents:
2711
diff
changeset
|
133 |
" |
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
134 |
resolvedValue := JavaResolver uniqueInstance |
749 | 135 |
resolveFieldIndentifiedByRef: self. |
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
136 |
resolvedValue isStatic ifTrue: [ resolvedClass := resolvedValue javaClass ] ifFalse: [ |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
137 |
resolvedClass := self classRef resolve: doClassInit. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
138 |
]. |
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
139 |
resolvedClass isNil ifTrue: [ self breakPoint: #mh ]. |
749 | 140 |
self resolveOffset. |
2745
d82859be4462
remove findResolvedStaticValue from JavaFieldRef2, not used anymore
Marcel Hlopko <marcel.hlopko@gmail.com>
parents:
2711
diff
changeset
|
141 |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
142 |
"Modified: / 07-12-2011 / 21:52:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
143 |
"Created: / 09-02-2012 / 23:09:18 / mh <hlopik@gmail.com>" |
2820 | 144 |
"Modified: / 12-10-2013 / 17:54:48 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>" |
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
145 |
"Modified: / 31-01-2014 / 03:02:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
146 |
! |
749 | 147 |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
148 |
findStaticOffset |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
149 |
"fieldRef must be resolved before calling me" |
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
150 |
self assert: resolvedClass notNil. |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
151 |
self assert: resolvedValue notNil. |
3660
5b1f89d1b991
Cleanup: use `#instVarIndexFor:` rather than `#instVarOffsetOf:`
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3412
diff
changeset
|
152 |
^ resolvedClass class instVarIndexFor: self name. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
153 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
154 |
"Created: / 07-12-2011 / 13:45:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
155 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
156 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
157 |
preResolve |
2799
b2fa940b8184
Fixed tests JavaFieldRefTests>>testCorrectResolving
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
158 |
| descriptor | |
b2fa940b8184
Fixed tests JavaFieldRefTests>>testCorrectResolving
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
159 |
|
b2fa940b8184
Fixed tests JavaFieldRefTests>>testCorrectResolving
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
160 |
descriptor := (constantPool at: nameAndTypeIndex) descriptor. |
b2fa940b8184
Fixed tests JavaFieldRefTests>>testCorrectResolving
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
161 |
type := 0. |
b2fa940b8184
Fixed tests JavaFieldRefTests>>testCorrectResolving
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
162 |
descriptor = 'J' ifTrue:[ |
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
163 |
type := ACX_R_LONG. |
749 | 164 |
] ifFalse:[ |
2801
62c767616a13
Fixed stupid bug in JavaFieldRef2 (did not correctly set type to R_DOUBLE for double fields)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2799
diff
changeset
|
165 |
descriptor = 'D' ifTrue:[ |
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
166 |
type := ACX_R_DOUBLE |
749 | 167 |
] |
168 |
]. |
|
169 |
||
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
170 |
"Created: / 16-10-2012 / 10:45:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
171 |
"Modified: / 31-01-2014 / 03:38:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
172 |
! |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
173 |
|
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
174 |
resolveOffset |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
175 |
"fieldRef must be resolved before calling me" |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
176 |
|
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
177 |
self assert: resolvedValue notNil. |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
178 |
self assert: resolvedClass isJavaClass. |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
179 |
resolvedValue isStatic ifTrue: [ resolvedOffset := self findStaticOffset. ] ifFalse: [ |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
180 |
resolvedOffset := self findInstOffset. |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
181 |
]. |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
182 |
self assert: resolvedOffset notNil. |
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
183 |
|
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
184 |
"Modified: / 07-12-2011 / 21:47:43 / Marcel Hlopko <hlopkmar@fel.cvut.cz>" |
749 | 185 |
! ! |
186 |
||
2858
3a85f55763e2
Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2827
diff
changeset
|
187 |
!JavaFieldRef2 methodsFor:'resolving'! |
3a85f55763e2
Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2827
diff
changeset
|
188 |
|
3a85f55763e2
Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2827
diff
changeset
|
189 |
invalidate |
2976
a384a02381c0
Update JavaLookup to work with new JIT-compilation scheme...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2858
diff
changeset
|
190 |
|
2992
732f9db2a195
Cleanup & refactoring of constant pool references (JavaRef2 hierarchy)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2976
diff
changeset
|
191 |
resolvedOffset := nil. |
2976
a384a02381c0
Update JavaLookup to work with new JIT-compilation scheme...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2858
diff
changeset
|
192 |
^ super invalidate. |
2858
3a85f55763e2
Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2827
diff
changeset
|
193 |
|
3a85f55763e2
Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2827
diff
changeset
|
194 |
"Created: / 14-10-2013 / 23:39:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3212
caa15c28f3a1
Fixed bad bug in realoding - do not flush type when invalidating field ref.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2992
diff
changeset
|
195 |
"Modified: / 07-08-2014 / 14:38:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2858
3a85f55763e2
Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2827
diff
changeset
|
196 |
! ! |
3a85f55763e2
Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2827
diff
changeset
|
197 |
|
749 | 198 |
!JavaFieldRef2 class methodsFor:'documentation'! |
199 |
||
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
200 |
version_CVS |
3412
df11bb428463
Merged with mercurial revision 4f3cc813be4 (8 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3360
diff
changeset
|
201 |
^ '$Header: /cvs/stx/stx/libjava/JavaFieldRef2.st,v 1.8 2015-03-20 12:08:00 vrany Exp $' |
2273
4320d6d1081e
fixed: #version_SVN ($ to §)
Claus Gittinger <cg@exept.de>
parents:
2234
diff
changeset
|
202 |
! |
4320d6d1081e
fixed: #version_SVN ($ to §)
Claus Gittinger <cg@exept.de>
parents:
2234
diff
changeset
|
203 |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
204 |
version_HG |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
205 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2273
diff
changeset
|
206 |
^ '$Changeset: <not expanded> $' |
2234 | 207 |
! |
208 |
||
749 | 209 |
version_SVN |
2731
13f5be2bf83b
Merged d87e89dd5276 and fe83a843a7bf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
210 |
^ 'Id' |
749 | 211 |
! ! |
212 |