# HG changeset patch # User Gilles Duboscq # Date 1330100199 -3600 # Node ID f5c1bd9c70b9a6a193806350a21bbfece8538d9f # Parent 7cb57ac24ab81682f54c8309c4f9c910e3d0ca9c# Parent e136f2d0d002988b071c081002018c734d4dead6 Merge diff -r 7cb57ac24ab8 -r f5c1bd9c70b9 graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/Bytecodes.java --- a/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/Bytecodes.java Fri Feb 24 13:42:24 2012 +0100 +++ b/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/Bytecodes.java Fri Feb 24 17:16:39 2012 +0100 @@ -328,8 +328,8 @@ try { for (Field field : Flags.class.getDeclaredFields()) { int flagsFilter = Modifier.FINAL | Modifier.STATIC; - if ((field.getModifiers() & flagsFilter) == flagsFilter) { - assert field.getType() == int.class : "Only " + field; + if ((field.getModifiers() & flagsFilter) == flagsFilter && !field.isSynthetic()) { + assert field.getType() == int.class : "Field is not int : " + field; final int flag = field.getInt(null); assert flag != 0; assert (flag & allFlags) == 0 : field.getName() + " has a value conflicting with another flag"; diff -r 7cb57ac24ab8 -r f5c1bd9c70b9 graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/GraphBuilderPhase.java --- a/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/GraphBuilderPhase.java Fri Feb 24 13:42:24 2012 +0100 +++ b/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/GraphBuilderPhase.java Fri Feb 24 17:16:39 2012 +0100 @@ -732,12 +732,8 @@ AnchorNode anchor = currentGraph.add(new AnchorNode()); append(anchor); CheckCastNode checkCast; - if (type instanceof RiResolvedType) { - RiResolvedType[] hints = getTypeCheckHints((RiResolvedType) type, 2); - checkCast = currentGraph.unique(new CheckCastNode(anchor, typeInstruction, (RiResolvedType) type, object, hints, Util.isFinalClass((RiResolvedType) type))); - } else { - checkCast = currentGraph.unique(new CheckCastNode(anchor, typeInstruction, (RiResolvedType) type, object)); - } + RiResolvedType[] hints = getTypeCheckHints((RiResolvedType) type, 2); + checkCast = currentGraph.unique(new CheckCastNode(anchor, typeInstruction, (RiResolvedType) type, object, hints, Util.isFinalClass((RiResolvedType) type))); append(currentGraph.add(new ValueAnchorNode(checkCast))); frameState.apush(checkCast); } else { diff -r 7cb57ac24ab8 -r f5c1bd9c70b9 mx/commands.py --- a/mx/commands.py Fri Feb 24 13:42:24 2012 +0100 +++ b/mx/commands.py Fri Feb 24 17:16:39 2012 +0100 @@ -46,6 +46,16 @@ This can be set via the global '--fastdebug' and '--debug' options. """ _vmbuild = 'product' +_jacoco = False + +_jacocoExcludes = ['com.oracle.max.graal.hotspot.snippets.ArrayCopySnippets', + 'com.oracle.max.graal.snippets.DoubleSnippets', + 'com.oracle.max.graal.snippets.FloatSnippets', + 'com.oracle.max.graal.snippets.MathSnippetsX86', + 'com.oracle.max.graal.snippets.NodeClassSnippets', + 'com.oracle.max.graal.hotspot.snippets.SystemSnippets', + 'com.oracle.max.graal.hotspot.snippets.UnsafeSnippets'] + _copyrightTemplate = """/* * Copyright (c) {0}, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -475,6 +485,15 @@ mx.expand_project_in_args(args) if mx.java().debug: args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000'] + args + if _jacoco: + jacocoagent = mx.library("JACOCOAGENT", True) + agentOptions = { + 'append' : 'false', + 'bootclasspath' : 'true', + 'includes' : 'com.oracle.max.*', + 'excludes' : ':'.join(_jacocoExcludes) + } + args = ['-javaagent:' + jacocoagent.get_path(True) + '=' + ','.join([k + '=' + v for k, v in agentOptions.items()])] + args exe = join(_jdk(build), 'bin', mx.exe_suffix('java')) return mx.run([exe, '-' + vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout) @@ -679,9 +698,9 @@ unittest([]) tasks.append(t.stop()) - # t = Task('JavaTesterTests:' + vmbuild) - # jtt([]) - # tasks.append(t.stop()) + t = Task('JavaTesterTests:' + vmbuild) + jtt([]) + tasks.append(t.stop()) for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild): t = Task(str(test) + ':' + vmbuild) @@ -810,6 +829,19 @@ path = join(_vmLibDirInJdk(_jdk(build)), lib) mx.download(path, ['http://lafo.ssw.uni-linz.ac.at/hsdis/' + flavor + "/" + lib]) +def jacocoreport(args): + """creates a JaCoCo coverage report + + Creates the report from the 'jacoco.exec' file in the current directory. + Default output directory is 'coverage', but an alternative can be provided as an argument.""" + jacocoreport = mx.library("JACOCOREPORT", True) + out = 'coverage' + if len(args) == 1: + out = args[0] + elif len(args) > 1: + mx.abort('jacocoreport takes only one argument : an output directory') + mx.run_java(['-jar', jacocoreport.get_path(True), '-in', 'jacoco.exec', '-g', join(_graal_home, 'graal'), out]) + def mx_init(): _vmbuild = 'product' commands = { @@ -827,8 +859,11 @@ 'bench' : [bench, '[-resultfile file] [all(default)|dacapo|specjvm2008|bootstrap]'], 'unittest' : [unittest, '[filters...]'], 'jtt' : [jtt, '[filters...]'], + 'jacocoreport' : [jacocoreport, '[output directory]'], 'vm': [vm, '[-options] class [args...]'] } + + mx.add_argument('--jacoco', action='store_true', dest='jacoco', help='instruments com.oracle.max.* classes using JaCoCo') if (_vmSourcesAvailable): mx.add_argument('--vm', action='store', dest='vm', default='graal', choices=['graal', 'server', 'client'], help='the VM to build/run (default: graal)') @@ -859,3 +894,6 @@ if hasattr(opts, 'vmbuild') and opts.vmbuild is not None: global _vmbuild _vmbuild = opts.vmbuild + if opts.jacoco: + global _jacoco + _jacoco = True diff -r 7cb57ac24ab8 -r f5c1bd9c70b9 mx/projects --- a/mx/projects Fri Feb 24 13:42:24 2012 +0100 +++ b/mx/projects Fri Feb 24 17:16:39 2012 +0100 @@ -41,6 +41,12 @@ library@DACAPO@path=lib/dacapo-9.12-bach.jar library@DACAPO@urls=http://dfn.dl.sourceforge.net/project/dacapobench/9.12-bach/dacapo-9.12-bach.jar +library@JACOCOAGENT@path=lib/jacocoagent.jar +library@JACOCOAGENT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoagent.jar + +library@JACOCOREPORT@path=lib/jacocoreport.jar +library@JACOCOREPORT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoreport.jar + library@DACAPO_SCALA@path=lib/dacapo-scala-0.1.0.jar library@DACAPO_SCALA@urls=http://repo.scalabench.org/snapshots/org/scalabench/benchmarks/scala-benchmark-suite/0.1.0-SNAPSHOT/scala-benchmark-suite-0.1.0-20110908.085753-2.jar