Skip to content

Commit 2c1dedf

Browse files
committed
Fix compilation error after rebase
1 parent 758ae40 commit 2c1dedf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
import com.oracle.graal.python.annotations.ClinicConverterFactory;
6161
import com.oracle.graal.python.annotations.ClinicConverterFactory.ArgumentIndex;
6262
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
63-
import com.oracle.graal.python.builtins.modules.ExternalFunctionNodes.DefaultCheckFunctionResultNode;
6463
import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins;
6564
import com.oracle.graal.python.builtins.modules.SysModuleBuiltins;
6665
import com.oracle.graal.python.builtins.objects.PNone;
@@ -74,6 +73,7 @@
7473
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsPythonObjectNode;
7574
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
7675
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToSulongNode;
76+
import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.DefaultCheckFunctionResultNode;
7777
import com.oracle.graal.python.builtins.objects.common.IndexNodes.NormalizeIndexNode;
7878
import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
7979
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/HPyExternalFunctionNodes.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@
4545

4646
import com.oracle.graal.python.PythonLanguage;
4747
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
48-
import com.oracle.graal.python.builtins.modules.ExternalFunctionNodes;
49-
import com.oracle.graal.python.builtins.modules.ExternalFunctionNodes.GetterRoot;
50-
import com.oracle.graal.python.builtins.modules.ExternalFunctionNodes.PExternalFunctionWrapper;
51-
import com.oracle.graal.python.builtins.modules.ExternalFunctionNodes.SetterRoot;
5248
import com.oracle.graal.python.builtins.objects.PNone;
5349
import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
5450
import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext.LLVMType;
5551
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.FromCharPointerNode;
5652
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
5753
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.FromCharPointerNodeGen;
54+
import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes;
55+
import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.GetterRoot;
56+
import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.PExternalFunctionWrapper;
57+
import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.SetterRoot;
5858
import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
5959
import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes;
6060
import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.CheckFunctionResultNode;

0 commit comments

Comments
 (0)