Wala merge

lib/WALASupport/InstrKindInfoGetter.cpp

@@ -228,14 +228,29 @@ jobject InstrKindInfoGetter::handleIntegerLiteralInst() {
   if (outs != NULL) {
     *outs << "<< IntegerLiteralInst >>" << "\n";
   }
-
-  IntegerLiteralInst* castInst = cast<IntegerLiteralInst>(instr);
-  APInt value = castInst->getValue();
-
-  jobject node = (*wala)->makeConstant((int) value.getSExtValue());
-  nodeMap->insert(std::make_pair(castInst, node));
-
-  return node;
+  IntegerLiteralInst* Inst = cast<IntegerLiteralInst>(instr);
+  APInt Value = Inst->getValue();
+  jobject Node = nullptr;
+  if (Value.isNegative()) {
+    if (Value.getMinSignedBits() <= 32) {
+      Node = (*wala)->makeConstant(static_cast<int>(Value.getSExtValue()));
+    }
+    else if (Value.getMinSignedBits() <= 64) {
+      Node = (*wala)->makeConstant(Value.getSExtValue());
+    }
+  }
+  else {
+    if (Value.getActiveBits() <= 32) {
+      Node = (*wala)->makeConstant(static_cast<int>(Value.getZExtValue()));
+    }
+    else if (Value.getActiveBits() <= 64) {
+      Node = (*wala)->makeConstant(static_cast<long>(Value.getZExtValue()));
+    }
+  }
+  if (Node != nullptr) {
+    nodeMap->insert(std::make_pair(Inst, Node));
+  }
+  return Node;
 }
 
 jobject InstrKindInfoGetter::handleStringLiteralInst() {
@@ -837,8 +852,8 @@ SILInstructionKind InstrKindInfoGetter::get() {
     }
 
     case SILInstructionKind::IntegerLiteralInst: {
-//       node = handleIntegerLiteralInst();
-      *outs << "<< IntegerLiteralInst Broken >>" << "\n";
+       node = handleIntegerLiteralInst();
+      *outs << "<< IntegerLiteralInst >>" << "\n";
       break;
     }
 
@@ -1394,4 +1409,4 @@ SILInstructionKind InstrKindInfoGetter::get() {
 
   *outs << *instr << "\n";
   return instrKind;
-}
+}

wala-tests/IntegerLiterals/int_decl.swift

@@ -0,0 +1,5 @@
+let x = 2147483647
+let y = 9223372036854775807
+let z = 0
+let a = -9223372036854775808
+let b = -2147483648

wala-tests/IntegerLiterals/uint_decl.swift

@@ -0,0 +1,3 @@
+let x: UInt = 4294967295
+let y: UInt = 18446744073709551615
+let z: UInt = 0