4444import static com .oracle .graal .python .util .PythonUtils .tsLiteral ;
4545
4646import com .oracle .graal .python .builtins .PythonBuiltinClassType ;
47+ import com .oracle .graal .python .builtins .objects .dict .PDict ;
4748import com .oracle .graal .python .builtins .objects .module .PythonModule ;
4849import com .oracle .graal .python .lib .PyCallableCheckNode ;
4950import com .oracle .graal .python .lib .PyObjectGetAttr ;
5051import com .oracle .graal .python .nodes .ErrorMessages ;
51- import com .oracle .graal .python .nodes .PGuards ;
5252import com .oracle .graal .python .nodes .PRaiseNode ;
5353import com .oracle .graal .python .runtime .PythonContext ;
5454import com .oracle .truffle .api .dsl .Bind ;
6161
6262public class PickleState {
6363 // copyreg.dispatch_table, {type_object: pickling_function}
64- Object dispatchTable ;
64+ PDict dispatchTable ;
6565
6666 // For the extension opcodes EXT1, EXT2 and EXT4.
6767 // copyreg._extension_registry, {(module_name, function_name): code}
68- Object extensionRegistry ;
68+ PDict extensionRegistry ;
6969 // copyreg._extension_cache, {code: object}
70- Object extensionCache ;
70+ PDict extensionCache ;
7171 // copyreg._inverted_registry, {code: (module_name, function_name)}
72- Object invertedRegistry ;
72+ PDict invertedRegistry ;
7373
7474 // codecs.encode, used for saving bytes in older protocols
7575 Object codecsEncode ;
@@ -81,12 +81,12 @@ public class PickleState {
8181
8282 // Import mappings for compatibility with Python 2.x
8383 // * _compat_pickle.NAME_MAPPING, {(oldmodule, oldname): (newmodule, newname)}
84- Object nameMapping2To3 ;
84+ PDict nameMapping2To3 ;
8585 // _compat_pickle.IMPORT_MAPPING, {oldmodule: newmodule}
86- Object importMapping2To3 ;
86+ PDict importMapping2To3 ;
8787 // Same, but with REVERSE_NAME_MAPPING / REVERSE_IMPORT_MAPPING
88- Object nameMapping3To2 ;
89- Object importMapping3To2 ;
88+ PDict nameMapping3To2 ;
89+ PDict importMapping3To2 ;
9090
9191 @ GenerateUncached
9292 @ GenerateInline (false ) // footprint reduction 36 -> 18
@@ -106,57 +106,75 @@ void init(PickleState state,
106106 final PythonModule builtins = context .getBuiltins ();
107107 state .getattr = getAttr .execute (null , inliningTarget , builtins , T_GETATTR );
108108
109- final Object copyreg = importModule (PickleUtils .T_MOD_COPYREG );
110- state .dispatchTable = getAttr .execute (null , inliningTarget , copyreg , PickleUtils .T_ATTR_DISPATCH_TABLE );
111- if (!PGuards .isDict (state .dispatchTable )) {
112- throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , "copyreg.dispatch_table" , "dict" , state .dispatchTable );
109+ var copyreg = importModule (PickleUtils .T_MOD_COPYREG );
110+ var dispatchTable = getAttr .execute (null , inliningTarget , copyreg , PickleUtils .T_ATTR_DISPATCH_TABLE );
111+ if (dispatchTable instanceof PDict dispatchTableDict ) {
112+ state .dispatchTable = dispatchTableDict ;
113+ } else {
114+ throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , "copyreg.dispatch_table" , "dict" , dispatchTable );
113115 }
114116
115- state .extensionRegistry = getAttr .execute (null , inliningTarget , copyreg , PickleUtils .T_ATTR_EXT_REGISTRY );
116- if (!PGuards .isDict (state .extensionRegistry )) {
117- throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , "copyreg._extension_registry" , "dict" , state .extensionRegistry );
117+ var extensionRegistry = getAttr .execute (null , inliningTarget , copyreg , PickleUtils .T_ATTR_EXT_REGISTRY );
118+ if (extensionRegistry instanceof PDict extensionRegistryDict ) {
119+ state .extensionRegistry = extensionRegistryDict ;
120+ } else {
121+ throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , "copyreg._extension_registry" , "dict" , extensionRegistry );
118122 }
119123
120- state .invertedRegistry = getAttr .execute (null , inliningTarget , copyreg , PickleUtils .T_ATTR_INV_REGISTRY );
121- if (!PGuards .isDict (state .invertedRegistry )) {
122- throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , "copyreg._inverted_registry" , "dict" , state .invertedRegistry );
124+ var invertedRegistry = getAttr .execute (null , inliningTarget , copyreg , PickleUtils .T_ATTR_INV_REGISTRY );
125+ if (invertedRegistry instanceof PDict invertedRegistryDict ) {
126+ state .invertedRegistry = invertedRegistryDict ;
127+ } else {
128+ throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , "copyreg._inverted_registry" , "dict" , invertedRegistry );
123129 }
124130
125- state .extensionCache = getAttr .execute (null , inliningTarget , copyreg , PickleUtils .T_ATTR_EXT_CACHE );
126- if (!PGuards .isDict (state .extensionCache )) {
127- throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , "copyreg._extension_cache" , "dict" , state .extensionCache );
131+ var extensionCache = getAttr .execute (null , inliningTarget , copyreg , PickleUtils .T_ATTR_EXT_CACHE );
132+ if (extensionCache instanceof PDict extensionCacheDict ) {
133+ state .extensionCache = extensionCacheDict ;
134+ } else {
135+ throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , "copyreg._extension_cache" , "dict" , extensionCache );
128136 }
129137
130138 final Object codecs = importModule (PickleUtils .T_MOD_CODECS );
131- state .codecsEncode = getAttr .execute (null , inliningTarget , codecs , PickleUtils .T_METHOD_ENCODE );
132- if (!callableCheck .execute (inliningTarget , state .codecsEncode )) {
133- throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , "codecs.encode" , "callable" , state .codecsEncode );
139+ var codecsEncode = getAttr .execute (null , inliningTarget , codecs , PickleUtils .T_METHOD_ENCODE );
140+ if (callableCheck .execute (inliningTarget , codecsEncode )) {
141+ state .codecsEncode = codecsEncode ;
142+ } else {
143+ throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , "codecs.encode" , "callable" , codecsEncode );
134144 }
135145
136146 final Object functools = importModule (PickleUtils .T_MOD_FUNCTOOLS );
137147 state .partial = getAttr .execute (null , inliningTarget , functools , PickleUtils .T_METHOD_PARTIAL );
138148
139149 // Load the 2.x -> 3.x stdlib module mapping tables
140150 Object compatPickle = importModule (PickleUtils .T_MOD_COMPAT_PICKLE );
141- state .nameMapping2To3 = getAttr .execute (null , inliningTarget , compatPickle , PickleUtils .T_ATTR_NAME_MAPPING );
142- if (!PGuards .isDict (state .nameMapping2To3 )) {
143- throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , PickleUtils .T_CP_NAME_MAPPING , "dict" , state .nameMapping2To3 );
151+ var nameMapping2To3 = getAttr .execute (null , inliningTarget , compatPickle , PickleUtils .T_ATTR_NAME_MAPPING );
152+ if (nameMapping2To3 instanceof PDict nameMapping2To3Dict ) {
153+ state .nameMapping2To3 = nameMapping2To3Dict ;
154+ } else {
155+ throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , PickleUtils .T_CP_NAME_MAPPING , "dict" , nameMapping2To3 );
144156 }
145- state .importMapping2To3 = getAttr .execute (null , inliningTarget , compatPickle , PickleUtils .T_ATTR_IMPORT_MAPPING );
146- if (!PGuards .isDict (state .nameMapping2To3 )) {
147- throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , PickleUtils .T_CP_IMPORT_MAPPING , "dict" , state .importMapping2To3 );
157+
158+ var importMapping2To3 = getAttr .execute (null , inliningTarget , compatPickle , PickleUtils .T_ATTR_IMPORT_MAPPING );
159+ if (importMapping2To3 instanceof PDict importMapping2To3Dict ) {
160+ state .importMapping2To3 = importMapping2To3Dict ;
161+ } else {
162+ throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , PickleUtils .T_CP_IMPORT_MAPPING , "dict" , importMapping2To3 );
148163 }
149164
150165 // ... and the 3.x -> 2.x mapping tables
151- state .nameMapping3To2 = getAttr .execute (null , inliningTarget , compatPickle , PickleUtils .T_ATTR_REVERSE_NAME_MAPPING );
152- if (!PGuards .isDict (state .nameMapping2To3 )) {
153- throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , PickleUtils .T_CP_REVERSE_NAME_MAPPING , "dict" ,
154- state .nameMapping3To2 );
166+ var nameMapping3To2 = getAttr .execute (null , inliningTarget , compatPickle , PickleUtils .T_ATTR_REVERSE_NAME_MAPPING );
167+ if (nameMapping3To2 instanceof PDict nameMapping3To2Dict ) {
168+ state .nameMapping3To2 = nameMapping3To2Dict ;
169+ } else {
170+ throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , PickleUtils .T_CP_REVERSE_NAME_MAPPING , "dict" , nameMapping3To2 );
155171 }
156- state .importMapping3To2 = getAttr .execute (null , inliningTarget , compatPickle , PickleUtils .T_ATTR_REVERSE_IMPORT_MAPPING );
157- if (!PGuards .isDict (state .nameMapping2To3 )) {
172+ var importMapping3To2 = getAttr .execute (null , inliningTarget , compatPickle , PickleUtils .T_ATTR_REVERSE_IMPORT_MAPPING );
173+ if (importMapping3To2 instanceof PDict importMapping3To2Dict ) {
174+ state .importMapping3To2 = importMapping3To2Dict ;
175+ } else {
158176 throw raiseNode .get (inliningTarget ).raise (PythonBuiltinClassType .RuntimeError , ErrorMessages .S_SHOULD_BE_A_S_NOT_A_P , PickleUtils .T_CP_REVERSE_IMPORT_MAPPING , "dict" ,
159- state . importMapping3To2 );
177+ importMapping3To2 );
160178 }
161179 }
162180 }
0 commit comments