Mercurial > hg > truffle
changeset 21027:53b3a10e2515
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 20 Apr 2015 15:38:51 +0200 |
parents | 931b0acc8d2e (current diff) 81e91799d6a1 (diff) |
children | 37b516b9080c |
files | |
diffstat | 13 files changed, 23 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.directives/src/com/oracle/graal/api/directives/GraalDirectives.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.graal.api.directives/src/com/oracle/graal/api/directives/GraalDirectives.java Mon Apr 20 15:38:51 2015 +0200 @@ -22,6 +22,8 @@ */ package com.oracle.graal.api.directives; +// JaCoCo Exclude + /** * Directives that influence the compilation of methods by Graal. They don't influence the semantics * of the code, but they are useful for unit testing and benchmarking.
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/LocationIdentity.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/LocationIdentity.java Mon Apr 20 15:38:51 2015 +0200 @@ -24,6 +24,8 @@ import java.util.*; +// JaCoCo Exclude + /** * Marker interface for location identities. Apart from the special values {@link #ANY_LOCATION} and * {@link #FINAL_LOCATION}, a different location identity of two memory accesses guarantees that the
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java Mon Apr 20 15:38:51 2015 +0200 @@ -36,6 +36,8 @@ import com.oracle.graal.nodes.extended.*; import com.oracle.graal.word.*; +// JaCoCo Exclude + /** * Substitutions for {@code com.sun.crypto.provider.AESCrypt} methods. */
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CipherBlockChainingSubstitutions.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CipherBlockChainingSubstitutions.java Mon Apr 20 15:38:51 2015 +0200 @@ -36,6 +36,8 @@ import com.oracle.graal.nodes.extended.*; import com.oracle.graal.word.*; +// JaCoCo Exclude + /** * Substitutions for {@code com.sun.crypto.provider.CipherBlockChaining} methods. */
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectSubstitutions.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectSubstitutions.java Mon Apr 20 15:38:51 2015 +0200 @@ -24,6 +24,8 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; +// JaCoCo Exclude + /** * Substitutions for {@link java.lang.Object} methods. */
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathSubstitutions.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathSubstitutions.java Mon Apr 20 15:38:51 2015 +0200 @@ -30,6 +30,8 @@ import com.oracle.graal.nodes.extended.*; import com.oracle.graal.replacements.amd64.AMD64MathIntrinsicNode.Operation; +// JaCoCo Exclude + /** * Substitutions for some {@link java.lang.Math} methods that leverage AMD64 instructions for * selected input values.
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ArraySubstitutions.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ArraySubstitutions.java Mon Apr 20 15:38:51 2015 +0200 @@ -28,6 +28,8 @@ import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; +// JaCoCo Exclude + /** * Substitutions for {@link java.lang.reflect.Array} methods. */
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ArraysSubstitutions.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ArraysSubstitutions.java Mon Apr 20 15:38:51 2015 +0200 @@ -24,6 +24,8 @@ import com.oracle.graal.replacements.nodes.*; +// JaCoCo Exclude + /** * Substitutions for {@link java.util.Arrays} methods. */
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/LongSubstitutions.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/LongSubstitutions.java Mon Apr 20 15:38:51 2015 +0200 @@ -24,6 +24,8 @@ import com.oracle.graal.replacements.nodes.*; +// JaCoCo Exclude + public class LongSubstitutions { public static int numberOfLeadingZeros(long i) {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StringSubstitutions.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StringSubstitutions.java Mon Apr 20 15:38:51 2015 +0200 @@ -28,6 +28,8 @@ import edu.umd.cs.findbugs.annotations.*; +// JaCoCo Exclude + /** * Substitutions for {@link java.lang.String} methods. */
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ArrayEqualsNode.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ArrayEqualsNode.java Mon Apr 20 15:38:51 2015 +0200 @@ -32,6 +32,8 @@ import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.util.*; +// JaCoCo Exclude + /** * Compares two arrays with the same length. */
--- a/graal/com.oracle.truffle.interop/src/com/oracle/truffle/interop/messages/Read.java Mon Apr 20 14:19:17 2015 +0200 +++ b/graal/com.oracle.truffle.interop/src/com/oracle/truffle/interop/messages/Read.java Mon Apr 20 15:38:51 2015 +0200 @@ -57,7 +57,7 @@ } Read m1 = this; Read m2 = (Read) message; - return MessageUtil.compareMessage(m1.getReceiver(), m2.getReceiver()) && MessageUtil.compareMessage(m1.getId(), m2.getId()); + return MessageUtil.compareMessage(m1.getReceiver(), m2.getReceiver()); } @Override