Skip to content

Commit a0a0db5

Browse files
committed
Remove branch for managed sulong from PyMemoryViewWrapper
1 parent 5277d08 commit a0a0db5

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyMemoryViewWrapper.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PTR_ADD;
4444
import static com.oracle.graal.python.builtins.objects.cext.structs.CFields.PyMemoryViewObject__exports;
4545
import static com.oracle.graal.python.builtins.objects.cext.structs.CFields.PyMemoryViewObject__flags;
46-
import static com.oracle.graal.python.builtins.objects.cext.structs.CFields.PyObject__ob_refcnt;
47-
import static com.oracle.graal.python.builtins.objects.cext.structs.CFields.PyObject__ob_type;
48-
import static com.oracle.graal.python.builtins.objects.cext.structs.CStructs.PyMemoryViewObject;
4946
import static com.oracle.truffle.api.CompilerDirectives.shouldNotReachHere;
5047

5148
import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAccessLibrary;
@@ -58,8 +55,6 @@
5855
import com.oracle.graal.python.builtins.objects.ints.PInt;
5956
import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
6057
import com.oracle.graal.python.builtins.objects.object.PythonObject;
61-
import com.oracle.graal.python.nodes.object.GetClassNode;
62-
import com.oracle.graal.python.runtime.PythonContext;
6358
import com.oracle.truffle.api.CompilerDirectives;
6459
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
6560
import com.oracle.truffle.api.interop.InteropLibrary;
@@ -95,14 +90,8 @@ private static Object allocate(PMemoryView object) {
9590
CExtNodes.AsCharPointerNode asCharPointerNode = CExtNodes.AsCharPointerNode.getUncached();
9691

9792
Object mem;
98-
if (!PythonContext.get(null).isNativeAccessAllowed()) { // accommodate managed mode.
99-
mem = CStructAccess.AllocateNode.allocUncached(PyMemoryViewObject.size()); /*- GC head alloc is not needed */
100-
writeI64Node.write(mem, PyObject__ob_refcnt, IMMORTAL_REFCNT); // TODO: immortal for now
101-
writePointerNode.write(mem, PyObject__ob_type, PythonToNativeNewRefNode.executeUncached(GetClassNode.executeUncached(object)));
102-
} else {
103-
long taggedPointer = CApiTransitions.FirstToNativeNode.executeUncached(object.getNativeWrapper(), true /*- TODO: immortal for now */);
104-
mem = CApiTransitions.HandlePointerConverter.pointerToStub(taggedPointer);
105-
}
93+
long taggedPointer = CApiTransitions.FirstToNativeNode.executeUncached(object.getNativeWrapper(), true /*- TODO: immortal for now */);
94+
mem = CApiTransitions.HandlePointerConverter.pointerToStub(taggedPointer);
10695
writeI32Node.write(mem, PyMemoryViewObject__flags, object.getFlags());
10796
writeI64Node.write(mem, PyMemoryViewObject__exports, object.getExports().get());
10897
// TODO: ignoring mbuf, hash and weakreflist for now

0 commit comments

Comments
 (0)