# HG changeset patch
# User Michael Van De Vanter  <michael.van.de.vanter@oracle.com>
# Date 1449516042 28800
# Node ID 1ea1e410ed3db838910d774e6d85d50b600350aa
# Parent  a6c162686d8129526bf7f21e1f83a13df11c4560# Parent  f9f97ca1d66d59b3351fe02ca8b47b3af2228002
Merge with f9f97ca1d66d59b3351fe02ca8b47b3af2228002

diff -r a6c162686d81 -r 1ea1e410ed3d truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/Debugger.java
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/Debugger.java	Sun Dec 06 20:13:49 2015 -0800
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/Debugger.java	Mon Dec 07 11:20:42 2015 -0800
@@ -774,7 +774,7 @@
                         final Node callNode = frameInstance.getCallNode();
                         if (callNode != null) {
                             final SourceSection sourceSection = callNode.getEncapsulatingSourceSection();
-                            if (sourceSection != null && sourceSection.getIdentifier() != SourceSection.UNKNOWN) {
+                            if (sourceSection != null && !sourceSection.getIdentifier().equals("<unknown>")) {
                                 frames.add(new FrameDebugDescription(frameIndex, frameInstance));
                                 frameIndex++;
                             } else if (TRACE) {
diff -r a6c162686d81 -r 1ea1e410ed3d truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/source/SourceSection.java
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/source/SourceSection.java	Sun Dec 06 20:13:49 2015 -0800
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/source/SourceSection.java	Mon Dec 07 11:20:42 2015 -0800
@@ -37,12 +37,6 @@
  * @see #createUnavailable
  */
 public final class SourceSection {
-
-    /**
-     * The identifier stored when source information is unavailable.
-     */
-    public static String UNKNOWN = "<unknown>";
-
     private final Source source;
     private final String identifier;
     private final int startLine;
@@ -268,6 +262,6 @@
      * @return source section which is mostly <em>empty</em>
      */
     public static SourceSection createUnavailable(String kind, String name) {
-        return new SourceSection(kind, null, name == null ? UNKNOWN : name, -1, -1, -1, -1);
+        return new SourceSection(kind, null, name == null ? "<unknown>" : name, -1, -1, -1, -1);
     }
 }