summaryrefslogtreecommitdiff
path: root/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2013-01-29 20:47:37 +0100
committerEugene Burmako <xeno.by@gmail.com>2013-10-18 17:44:40 +0200
commit484d6d70a4c51d0ddf220c67265182949e69ca45 (patch)
treef4b2db07033bf52937b43658ef276fc8bfd0fdf9 /src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
parentf7c6213ee7cd4afb6f11b5ce14479aa68974b01c (diff)
downloadscala-484d6d70a4c51d0ddf220c67265182949e69ca45.tar.gz
scala-484d6d70a4c51d0ddf220c67265182949e69ca45.tar.bz2
scala-484d6d70a4c51d0ddf220c67265182949e69ca45.zip
SI-6240 introduces GIL to Scala reflection
On a serious note, I feel really uncomfortable about having to juggle this slew of locks. Despite that I can't immediately find a deadlock, I'm 100% sure there is one hiding in the shadows. Hence, I'm abandoning all runtime reflection locks in favor of a single per-universe one.
Diffstat (limited to 'src/reflect/scala/reflect/runtime/JavaUniverseForce.scala')
-rw-r--r--src/reflect/scala/reflect/runtime/JavaUniverseForce.scala7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
index 856a9ad8f9..70126e713a 100644
--- a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
+++ b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
@@ -27,11 +27,10 @@ trait JavaUniverseForce { self: runtime.JavaUniverse =>
this.settings
this.treeInfo
+ this.gil
// inaccessible: this.uniqueLock
- // inaccessible: this.subsametypeLock
- // inaccessible: this.lubglbLock
- // inaccessible: this.indentLock
- // inaccessible: this.toStringLock
+ // inaccessible: this.nextIdLock
+ // inaccessible: this.freshExistentialNameLock
// inaccessible: this.mirrors
this.rootMirror
this.treeBuild