1.1 --- a/test/tools/javac/flow/tests/TestCaseSwitch.java Fri Jun 27 14:01:25 2014 -0700 1.2 +++ b/test/tools/javac/flow/tests/TestCaseSwitch.java Fri Jun 27 20:32:12 2014 +0100 1.3 @@ -5,7 +5,7 @@ 1.4 @AliveRange(varName="o", bytecodeStart=31, bytecodeLength=16) 1.5 @AliveRange(varName="o", bytecodeStart=50, bytecodeLength=15) 1.6 @AliveRange(varName="o", bytecodeStart=68, bytecodeLength=1) 1.7 - @AliveRange(varName="oo", bytecodeStart=39, bytecodeLength=26) 1.8 + @AliveRange(varName="oo", bytecodeStart=39, bytecodeLength=8) 1.9 @AliveRange(varName="uu", bytecodeStart=59, bytecodeLength=6) 1.10 void m1(String[] args) { 1.11 Object o; 1.12 @@ -29,7 +29,7 @@ 1.13 @AliveRange(varName="o", bytecodeStart=95, bytecodeLength=18) 1.14 @AliveRange(varName="o", bytecodeStart=116, bytecodeLength=15) 1.15 @AliveRange(varName="o", bytecodeStart=134, bytecodeLength=1) 1.16 - @AliveRange(varName="oo", bytecodeStart=104, bytecodeLength=27) 1.17 + @AliveRange(varName="oo", bytecodeStart=104, bytecodeLength=9) 1.18 @AliveRange(varName="uu", bytecodeStart=125, bytecodeLength=6) 1.19 void m2(String[] args) { 1.20 Object o; 1.21 @@ -50,12 +50,14 @@ 1.22 o = "return"; 1.23 } 1.24 1.25 - @AliveRange(varName="o", bytecodeStart=31, bytecodeLength=8) 1.26 - @AliveRange(varName="o", bytecodeStart=42, bytecodeLength=8) 1.27 - @AliveRange(varName="o", bytecodeStart=53, bytecodeLength=9) 1.28 - void m3(String[] args) { 1.29 + @AliveRange(varName="o", bytecodeStart=35, bytecodeLength=8) 1.30 + @AliveRange(varName="o", bytecodeStart=46, bytecodeLength=8) 1.31 + @AliveRange(varName="o", bytecodeStart=78, bytecodeLength=5) 1.32 + @AliveRange(varName="o", bytecodeStart=86, bytecodeLength=1) 1.33 + @AliveRange(varName="oo", bytecodeStart=56, bytecodeLength=16) 1.34 + void m3(int i) { 1.35 Object o; 1.36 - switch (args.length) { 1.37 + switch (i) { 1.38 case 0: 1.39 o = "0"; 1.40 o.hashCode(); 1.41 @@ -64,10 +66,19 @@ 1.42 o = "1"; 1.43 o.hashCode(); 1.44 break; 1.45 + case 2: 1.46 + int oo = i; 1.47 + if (oo > 1) { 1.48 + System.out.println("greater"); 1.49 + } 1.50 + break; 1.51 + case 3: 1.52 + int uu = i; 1.53 default: 1.54 o = "default"; 1.55 o.hashCode(); 1.56 } 1.57 o = "finish"; 1.58 } 1.59 + 1.60 }