Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Lower.java	Wed Jul 27 11:53:17 2011 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java	Thu Aug 04 11:15:37 2011 -0700
     1.3 @@ -3450,6 +3450,7 @@
     1.4                  JCExpression expression = oneCase.getExpression();
     1.5  
     1.6                  if (expression != null) { // expression for a "default" case is null
     1.7 +                    expression = TreeInfo.skipParens(expression);
     1.8                      String labelExpr = (String) expression.type.constValue();
     1.9                      Integer mapping = caseLabelToPosition.put(labelExpr, casePosition);
    1.10                      Assert.checkNull(mapping);
    1.11 @@ -3555,8 +3556,8 @@
    1.12                  if (isDefault)
    1.13                      caseExpr = null;
    1.14                  else {
    1.15 -                    caseExpr = make.Literal(caseLabelToPosition.get((String)oneCase.
    1.16 -                                                                    getExpression().
    1.17 +                    caseExpr = make.Literal(caseLabelToPosition.get((String)TreeInfo.skipParens(oneCase.
    1.18 +                                                                                                getExpression()).
    1.19                                                                      type.constValue()));
    1.20                  }
    1.21