# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1396799220 -7200
# Node ID 602c090252e05d408d3672fd0a010e8cea7e969d
# Parent  64dcb92ee75a24dfad340ec9807db2aa9da09bb5# Parent  a0200c215fb217eb8dcbf5f8f56455b25be37469
Merge.

diff -r 64dcb92ee75a -r 602c090252e0 graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/BranchProfileTest.java
--- a/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/BranchProfileTest.java	Sun Apr 06 17:46:24 2014 +0200
+++ b/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/BranchProfileTest.java	Sun Apr 06 17:47:00 2014 +0200
@@ -22,6 +22,8 @@
  */
 package com.oracle.truffle.api.test.utilities;
 
+import static org.junit.Assert.*;
+
 import org.junit.*;
 
 import com.oracle.truffle.api.utilities.*;
@@ -35,4 +37,16 @@
         profile.enter();
     }
 
+    @Test
+    public void testToString() {
+        BranchProfile profile = new BranchProfile();
+        assertTrue(profile.toString().contains(profile.getClass().getSimpleName()));
+        assertTrue(profile.toString().contains("not-visited"));
+        assertTrue(profile.toString().contains(Integer.toHexString(profile.hashCode())));
+        profile.enter();
+        assertTrue(profile.toString().contains(profile.getClass().getSimpleName()));
+        assertTrue(profile.toString().contains("visited"));
+        assertTrue(profile.toString().contains(Integer.toHexString(profile.hashCode())));
+    }
+
 }
diff -r 64dcb92ee75a -r 602c090252e0 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/BranchProfile.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/BranchProfile.java	Sun Apr 06 17:46:24 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/BranchProfile.java	Sun Apr 06 17:47:00 2014 +0200
@@ -44,4 +44,9 @@
         }
     }
 
+    @Override
+    public String toString() {
+        return String.format("%s(%s)@%x", getClass().getSimpleName(), visited ? "visited" : "not-visited", hashCode());
+    }
+
 }