Mercurial > hg > truffle

changeset 12674:ecd519b39f10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't try and get override for StableOptionValues
author Doug Simon <doug.simon@oracle.com>
date Tue, 05 Nov 2013 13:56:00 +0100
parents df42ff42279f
children 7fedc59e2cdc
files graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionValue.java
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionValue.java	Tue Nov 05 12:48:56 2013 +0100
+++ b/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionValue.java	Tue Nov 05 13:56:00 2013 +0100
@@ -182,11 +182,13 @@
      * Gets the value of this option.
      */
     public T getValue() {
-        OverrideScope overrideScope = overrideScopes.get();
-        if (overrideScope != null) {
-            T override = overrideScope.getOverride(this);
-            if (override != null) {
-                return override;
+        if (!(this instanceof StableOptionValue)) {
+            OverrideScope overrideScope = overrideScopes.get();
+            if (overrideScope != null) {
+                T override = overrideScope.getOverride(this);
+                if (override != null) {
+                    return override;
+                }
             }
         }
         if (value == UNINITIALIZED) {