From 355ac58ee3debd7620daf6736a244d99119802c7 Mon Sep 17 00:00:00 2001
From: msridhar1 <msridhar1@f5eafffb-2e1d-0410-98e4-8ec43c5233c4>
Date: Wed, 19 Mar 2008 20:22:30 +0000
Subject: [PATCH] bug fix for local value number

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@2718 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
---
 .../analysis/reflection/ForNameContextInterpreter.java   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ForNameContextInterpreter.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ForNameContextInterpreter.java
index a1b0b642b..100ceedff 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ForNameContextInterpreter.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ForNameContextInterpreter.java
@@ -105,8 +105,8 @@ public class ForNameContextInterpreter implements SSAContextInterpreter {
 
   private SSAInstruction[] makeStatements(JavaTypeContext context) {
     ArrayList<SSAInstruction> statements = new ArrayList<SSAInstruction>();
-    int nextLocal = 1;
-    int retValue = nextLocal++;
+    // vn1 is the string parameter
+    int retValue = 2;
     TypeReference tr = context.getType().getTypeReference();
     if (tr != null) {
       SSALoadClassInstruction l = new SSALoadClassInstruction(retValue, tr);
@@ -118,10 +118,7 @@ public class ForNameContextInterpreter implements SSAContextInterpreter {
       statements.add(t);
     }
     SSAInstruction[] result = new SSAInstruction[statements.size()];
-    Iterator<SSAInstruction> it = statements.iterator();
-    for (int i = 0; i < result.length; i++) {
-      result[i] = it.next();
-    }
+    statements.toArray(result);
     return result;
   }