New LLVM constant getelementptr expression.

Author: rschatz

sulong/projects/com.oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/listeners/Constants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -66,7 +66,7 @@ public final class Constants implements ParserListener {
     private static final int CONSTANT_CSTRING = 9;
     private static final int CONSTANT_CE_BINOP = 10;
     private static final int CONSTANT_CE_CAST = 11;
-    private static final int CONSTANT_CE_GEP = 12;
+    private static final int CONSTANT_CE_GEP_OLD = 12;
     private static final int CONSTANT_CE_SELECT = 13;
     // private static final int CONSTANT_CE_EXTRACTELT = 14;
     // private static final int CONSTANT_CE_INSERTELT = 15;
@@ -78,13 +78,16 @@ public final class Constants implements ParserListener {
     private static final int CONSTANT_BLOCKADDRESS = 21;
     private static final int CONSTANT_DATA = 22;
     private static final int CONSTANT_INLINEASM_OLD2 = 23;
-    private static final int CONSTANT_CE_GEP_WITH_INRANGE_INDEX = 24;
+    private static final int CONSTANT_CE_GEP_WITH_INRANGE_INDEX_OLD = 24;
     private static final int CONSTANT_CE_UNOP = 25;
     private static final int CONSTANT_POISON = 26;
     // private static final int CONSTANT_DSO_LOCAL_EQUIVALENT = 27;
     // private static final int CONSTANT_INLINEASM_OLD3 = 28;
     // private static final int CONSTANT_NO_CFI_VALUE = 29;
     private static final int CONSTANT_INLINEASM = 30;
+    private static final int CONSTANT_CE_GEP_WITH_INRANGE = 31;
+    private static final int CONSTANT_CE_GEP = 32;
+    // private static final int CONSTANT_PTRAUTH = 30;
 
     private static final BigInteger WIDE_INTEGER_MASK = BigInteger.ONE.shiftLeft(Long.SIZE).subtract(BigInteger.ONE);
 
@@ -207,9 +210,11 @@ public void record(RecordBuffer buffer) {
                 scope.addSymbol(InlineAsmConstant.createFromData(type, fnType, buffer), type);
                 return;
 
-            case CONSTANT_CE_GEP:
+            case CONSTANT_CE_GEP_OLD:
             case CONSTANT_CE_INBOUNDS_GEP:
-            case CONSTANT_CE_GEP_WITH_INRANGE_INDEX:
+            case CONSTANT_CE_GEP_WITH_INRANGE_INDEX_OLD:
+            case CONSTANT_CE_GEP_WITH_INRANGE:
+            case CONSTANT_CE_GEP:
                 createGetElementPointerExpression(buffer);
                 return;
 
@@ -229,12 +234,25 @@ public void record(RecordBuffer buffer) {
     private void createGetElementPointerExpression(RecordBuffer buffer) {
         int opCode = buffer.getId();
         Type gepType = null;
-        if (opCode == CONSTANT_CE_GEP_WITH_INRANGE_INDEX || buffer.size() % 2 != 0) {
+        if (opCode == CONSTANT_CE_GEP_WITH_INRANGE_INDEX_OLD ||
+                        opCode == CONSTANT_CE_GEP_WITH_INRANGE ||
+                        opCode == CONSTANT_CE_GEP || buffer.size() % 2 != 0) {
             gepType = types.get(buffer.read());
         }
 
         boolean isInbounds;
-        if (opCode == CONSTANT_CE_GEP_WITH_INRANGE_INDEX) {
+        // structure of this if on purpose kept very similar to the code in LLVMs BitcodeReader.cpp
+        if (opCode == CONSTANT_CE_GEP_WITH_INRANGE_INDEX_OLD) {
+            long op = buffer.read();
+            isInbounds = (op & 0x1) != 0;
+        } else if (opCode == CONSTANT_CE_GEP_WITH_INRANGE) {
+            long op = buffer.read();
+            // ignore nuw and nusw flags
+            isInbounds = (op & 0x1) != 0;
+            // ignore the range
+            long bitWidth = buffer.read();
+            buffer.skipConstantRange(bitWidth);
+        } else if (opCode == CONSTANT_CE_GEP) {
             long op = buffer.read();
             isInbounds = (op & 0x1) != 0;
         } else {

sulong/projects/com.oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/listeners/ParameterAttributes.java

@@ -271,7 +271,7 @@ private void decodeGroupCodeEntry(RecordBuffer buffer) {
                     // these attributes are not actually used by Sulong, skip over them
                     Attribute.Kind.decode(buffer.read());
                     long bitWidth = buffer.read();
-                    skipConstantRange(buffer, bitWidth);
+                    buffer.skipConstantRange(bitWidth);
                     break;
                 }
 
@@ -281,7 +281,7 @@ private void decodeGroupCodeEntry(RecordBuffer buffer) {
                     long rangeSize = buffer.read();
                     long bitWidth = buffer.read();
                     for (int i = 0; i < rangeSize; i++) {
-                        skipConstantRange(buffer, bitWidth);
+                        buffer.skipConstantRange(bitWidth);
                     }
                     break;
                 }
@@ -292,19 +292,6 @@ private void decodeGroupCodeEntry(RecordBuffer buffer) {
         }
     }
 
-    private static void skipConstantRange(RecordBuffer buffer, long bitWidth) {
-        if (bitWidth > 64) {
-            long activeWords = buffer.read();
-            long lowerActiveWords = activeWords & ((1L << 32) - 1);
-            long upperActiveWords = activeWords >>> 32;
-            buffer.skip(lowerActiveWords);
-            buffer.skip(upperActiveWords);
-        } else {
-            buffer.skip(); // start
-            buffer.skip(); // end
-        }
-    }
-
     private static String readString(RecordBuffer buffer) {
         StringBuilder sb = new StringBuilder();
         while (true) {

sulong/projects/com.oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/scanner/RecordBuffer.java

@@ -108,6 +108,19 @@ public void skip() {
         index++;
     }
 
+    public void skipConstantRange(long bitWidth) {
+        if (bitWidth > 64) {
+            long activeWords = read();
+            long lowerActiveWords = activeWords & ((1L << 32) - 1);
+            long upperActiveWords = activeWords >>> 32;
+            skip(lowerActiveWords);
+            skip(upperActiveWords);
+        } else {
+            skip(); // start
+            skip(); // end
+        }
+    }
+
     public void skip(long nr) {
         index += nr;
     }