Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master-20140721

Conflicts:
	src/main/scala/scala/async/internal/AsyncTransform.scala
	src/main/scala/scala/async/internal/Lifter.scala

1 files changed, 7 insertions, 1 deletions

diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala
index a01a801..665dead 100644
--- a/src/main/scala/scala/async/internal/TransformUtils.scala
+++ b/src/main/scala/scala/async/internal/TransformUtils.scala
@@ -164,11 +164,17 @@ private[async] trait TransformUtils {
       case ld: LabelDef => ld.symbol
     }.toSet
     t.exists {
-      case rt: RefTree => !(labelDefs contains rt.symbol)
+      case rt: RefTree => rt.symbol != null && isLabel(rt.symbol) && !(labelDefs contains rt.symbol)
       case _ => false
     }
   }
 
+  private def isLabel(sym: Symbol): Boolean = {
+    val LABEL = 1L << 17 // not in the public reflection API.
+    (internal.flags(sym).asInstanceOf[Long] & LABEL) != 0L
+  }
+
+
   /** Map a list of arguments to:
     * - A list of argument Trees
     * - A list of auxillary results.