@@ -1405,17 +1405,12 @@ Object dir(VirtualFrame frame, Object klass,
1405
1405
@ Cached com .oracle .graal .python .nodes .call .CallNode callNode ,
1406
1406
@ Cached ToArrayNode toArrayNode ,
1407
1407
@ Cached ("createGetAttrNode()" ) GetFixedAttributeNode getBasesNode ) {
1408
- PSet names = dir (frame , klass ,
1409
- inliningTarget , lookupAttrNode , callNode , getBasesNode , toArrayNode );
1408
+ PSet names = dir (frame , inliningTarget , klass , lookupAttrNode , callNode , getBasesNode , toArrayNode );
1410
1409
return names ;
1411
1410
}
1412
1411
1413
- private PSet dir (VirtualFrame frame , Object klass ,
1414
- Node inliningTarget ,
1415
- PyObjectLookupAttr lookupAttrNode ,
1416
- com .oracle .graal .python .nodes .call .CallNode callNode ,
1417
- GetFixedAttributeNode getBasesNode ,
1418
- ToArrayNode toArrayNode ) {
1412
+ private PSet dir (VirtualFrame frame , Node inliningTarget , Object klass , PyObjectLookupAttr lookupAttrNode , com .oracle .graal .python .nodes .call .CallNode callNode ,
1413
+ GetFixedAttributeNode getBasesNode , ToArrayNode toArrayNode ) {
1419
1414
PSet names = factory ().createSet ();
1420
1415
Object updateCallable = lookupAttrNode .execute (frame , inliningTarget , names , T_UPDATE );
1421
1416
Object ns = lookupAttrNode .execute (frame , inliningTarget , klass , T___DICT__ );
@@ -1428,8 +1423,7 @@ private PSet dir(VirtualFrame frame, Object klass,
1428
1423
for (Object cls : bases ) {
1429
1424
// Note that since we are only interested in the keys, the order
1430
1425
// we merge classes is unimportant
1431
- Object baseNames = dir (frame , cls ,
1432
- inliningTarget , lookupAttrNode , callNode , getBasesNode , toArrayNode );
1426
+ Object baseNames = dir (frame , inliningTarget , cls , lookupAttrNode , callNode , getBasesNode , toArrayNode );
1433
1427
callNode .execute (frame , updateCallable , baseNames );
1434
1428
}
1435
1429
}
0 commit comments