[Truffle] Narrowed the condition variable's type in ConditionVariable…

… to help out static analysis.
jruby · Oct 14, 2016 · 64cb1a9 · 64cb1a9 · chrisseaton · Oct 14, 2016
1 parent 4dff9a5
commit 64cb1a9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/mutex/ConditionVariableLayout.java b/truffle/src/main/java/org/jruby/truffle/core/mutex/ConditionVariableLayout.java
@@ -23,10 +23,10 @@ DynamicObjectFactory createConditionVariableShape(
 
     DynamicObject createConditionVariable(
             DynamicObjectFactory factory,
-            Object condition);
+            ConditionVariableObject condition);
 
     boolean isConditionVariable(DynamicObject object);
 
-    Object getCondition(DynamicObject object);
+    ConditionVariableObject getCondition(DynamicObject object);
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/core/mutex/ConditionVariableNodes.java b/truffle/src/main/java/org/jruby/truffle/core/mutex/ConditionVariableNodes.java
@@ -34,7 +34,7 @@
 @CoreClass("ConditionVariable")
 public abstract class ConditionVariableNodes {
 
-    private static Object getCondition(DynamicObject conditionVariable) {
+    private static ConditionVariableObject getCondition(DynamicObject conditionVariable) {
         return Layouts.CONDITION_VARIABLE.getCondition(conditionVariable);
     }
 
@@ -50,7 +50,7 @@ public AllocateNode(RubyContext context, SourceSection sourceSection) {
 
         @Specialization
         public DynamicObject allocate(DynamicObject rubyClass) {
-            return allocateNode.allocate(rubyClass, new Object());
+            return allocateNode.allocate(rubyClass, new ConditionVariableObject());
         }
 
     }
@@ -72,7 +72,7 @@ public RubyNode coerceDuration(RubyNode duration) {
         public DynamicObject wait(DynamicObject conditionVariable, DynamicObject mutex, long timeoutInMillis) {
             final ReentrantLock lock = Layouts.MUTEX.getLock(mutex);
             final DynamicObject thread = getContext().getThreadManager().getCurrentThread();
-            final Object condition = getCondition(conditionVariable);
+            final ConditionVariableObject condition = getCondition(conditionVariable);
 
             doWait(timeoutInMillis, lock, thread, condition);
 
@@ -130,7 +130,7 @@ public abstract static class SignalNode extends UnaryCoreMethodNode {
         @TruffleBoundary
         @Specialization
         public DynamicObject doSignal(DynamicObject conditionVariable) {
-            final Object condition = getCondition(conditionVariable);
+            final ConditionVariableObject condition = getCondition(conditionVariable);
             synchronized (condition) {
                 condition.notify();
             }
@@ -145,7 +145,7 @@ public abstract static class BroadcastNode extends UnaryCoreMethodNode {
         @TruffleBoundary
         @Specialization
         public DynamicObject doBroadcast(DynamicObject conditionVariable) {
-            final Object condition = getCondition(conditionVariable);
+            final ConditionVariableObject condition = getCondition(conditionVariable);
             synchronized (condition) {
                 condition.notifyAll();
             }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/mutex/ConditionVariableObject.java b/truffle/src/main/java/org/jruby/truffle/core/mutex/ConditionVariableObject.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.core.mutex;
+
+public class ConditionVariableObject {
+}