Skip to content

Commit

Permalink
Merge master.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dougxc
dougxc committed Dec 10, 2019
2 parents 00e8182 + 838e5aa commit d111e90
Show file tree
Hide file tree
Showing 1,282 changed files with 68,022 additions and 16,749 deletions.
21 changes: 18 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jdk:

env:
global:
- JVMCI_VERSION="jvmci-19.3-b03"
- JDK8_UPDATE_VERSION="222"
- JVMCI_VERSION="jvmci-19.3-b05"
- JDK8_UPDATE_VERSION="232"
- JDK8_UPDATE_VERSION_SUFFIX=""

matrix:
Expand All @@ -46,6 +46,12 @@ matrix:
- env: JDK="jdk11" GATE="style,fullbuild" PRIMARY="compiler"
- env: JDK="jdk11" GATE="build,test" PRIMARY="compiler"
- env: JDK="jdk11" GATE="build,bootstraplite" PRIMARY="compiler"
- os: linux
arch: arm64
env: JDK="jdk11" GATE="fullbuild,test" PRIMARY="compiler"
- os: linux
arch: arm64
env: JDK="jdk11" GATE="build,bootstraplite" PRIMARY="compiler"
# GR-16977
# - env: JDK="jdk11" GATE="build,test,helloworld" PRIMARY="substratevm"

Expand Down Expand Up @@ -88,10 +94,19 @@ install:
tar -C ${TRAVIS_BUILD_DIR}/.. -xzf ${JDK_TAR}
export JAVA_HOME=${TRAVIS_BUILD_DIR}/../openjdk1.8.0_${JDK8_UPDATE_VERSION}-${JVMCI_VERSION}
fi
- |
if [ "${JDK}" == "jdk11" ]
then
# Set the JAVA_HOME to openjdk11 if it is not set
if [ "${JAVA_HOME}" == "" ]
then
export JAVA_HOME=$(realpath $(dirname $(which java | xargs realpath))/../)
fi
fi
script:
- echo ${JAVA_HOME}
- ${JAVA_HOME}/bin/java -version
- mx --primary-suite-path ${TRAVIS_BUILD_DIR}/${PRIMARY} --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE}
- mx --primary-suite-path ${TRAVIS_BUILD_DIR}/${PRIMARY} --J @"-Xmx2g" --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE}
after_failure:
- cat hs_err*
14 changes: 5 additions & 9 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Thank you for thinking about contributing something to Graal!
GraalVM welcomes contributors to the core platform and projects that extend that
platform. There have been significant contributions from both industry
and academia so far and we thank you for considering to contribute your changes!

You will need to sign the Oracle Contributor Agreement for us to able to merge
your work.

http://www.graalvm.org/community/contributors/

We also have a code of conduct for contributors.

http://www.graalvm.org/community/conduct/
- Learn [how to become a GraalVM contributor](https://www.graalvm.org/community/contributors/).
- Subscribe and post to [[email protected]](https://oss.oracle.com/mailman/listinfo/graalvm-dev) for questions related to working with the sources or extending the GraalVM ecosystem by creating new languages, tools, or embeddings.
17 changes: 9 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# GraalVM

[![Join the chat at https://gitter.im/graalvm/home](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/graalvm/home?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![https://graalvm.slack.com](https://img.shields.io/badge/slack-join%20channel-active)](https://www.graalvm.org/slack-invitation/)

GraalVM is a universal virtual machine for running applications written in JavaScript, Python, Ruby, R, JVM-based languages like Java, Scala, Clojure, Kotlin, and LLVM-based languages such as C and C++.

The project website at [https://www.graalvm.org](https://www.graalvm.org) describes how to [get started](https://www.graalvm.org/docs/getting-started/), how to [stay connected](https://www.graalvm.org/community/), and how to [contribute](https://www.graalvm.org/community/contributors/).


## Repository Structure

The GraalVM main source repository includes the following components:
Expand All @@ -31,17 +30,18 @@ images or shared objects.

* [VM](vm/README.md) includes the components to build a modular GraalVM image.

* [VS Code](/vscode/README.md) provides extensions to Visual Studio Code that support development of polyglot applications using GraalVM.

## Reporting Vulnerabilities

Please report security vulnerabilities not via GitHub issues or the public mailing lists, but via the process outlined at [Reporting Vulnerabilities guide](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html).
## Get Support

* Open a [GitHub issue](https://github.com/oracle/graal/issues) for bug reports, questions, or requests for enhancements.
* Report a security vulnerability according to the [Reporting Vulnerabilities guide](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html).

## Related Repositories

GraalVM allows running of following languages which are being developed and tested in related repositories with GraalVM core to run on top of it using Truffle and the GraalVM compiler. These are:
* [GraalJS](https://github.com/graalvm/graaljs) - JavaScript (ECMAScript 2019 compatible) and Node.js 10.15.2
* [FastR](https://github.com/oracle/fastr) - R Language 3.5.1
* [GraalJS](https://github.com/graalvm/graaljs) - JavaScript (ECMAScript 2019 compatible) and Node.js 10.16.3
* [FastR](https://github.com/oracle/fastr) - R Language 3.6.1
* [GraalPython](https://github.com/graalvm/graalpython) - Python 3.7
* [TruffleRuby](https://github.com/oracle/truffleruby/) - Ruby Programming Language 2.6.2
* [SimpleLanguage](https://github.com/graalvm/simplelanguage) - A simple demonstration language for the GraalVM.
Expand All @@ -52,8 +52,9 @@ GraalVM allows running of following languages which are being developed and test
Each GraalVM component is licensed:
* [Truffle Framework](/truffle/) and its dependency [GraalVM SDK](/sdk/) are licensed under the [Universal Permissive License](truffle/LICENSE.md).
* [Tools](/tools/) project is licensed under the [GPL 2 with Classpath exception](tools/LICENSE).
* [TRegex](/regex/) project is licensed under the [GPL 2 with Classpath exception](regex/LICENSE.GPL.md).
* [TRegex](/regex/) project is licensed under the [Universal Permissive License](regex/LICENSE.md).
* [GraalVM compiler](/compiler/) is licensed under the [GPL 2 with Classpath exception](compiler/LICENSE.md).
* [Substrate VM](/substratevm/) is licensed under the [GPL 2 with Classpath exception](substratevm/LICENSE).
* [Sulong](/sulong/) is licensed under [3-clause BSD](sulong/LICENSE).
* [VM](/vm/) is licensed under the [GPL 2 with Classpath exception](vm/LICENSE_GRAALVM_CE).
* [VS Code](/vscode/) extensions are distributed under the [UPL 1.0 license](/vscode/graalvm/LICENSE.txt).
148 changes: 88 additions & 60 deletions 3rd_party_licenses.txt → THIRD_PARTY_LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,39 @@
===============================================================================

The following sections contain licensing information for libraries that we have
included with the GraalVM Community Edition 1.0 source and components used to
test GraalVM Community Edition 1.0. We are thankful to all individuals that
included with the GraalVM Community Edition source and components used to
test GraalVM Community Edition. We are thankful to all individuals that
have created these.
The following software may be included in this product:

===============================================================================

LibFFI
JSON 20180813

Copyright (c) 2002 JSON.org

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

The Software shall be used for Good, not Evil.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
================================================================================

LibFFI Library 3.2.1

https://github.com/atgreen/libffi/blob/master/LICENSE

libffi - Copyright (c) 1996-2014 Anthony Green, Red Hat, Inc and others.
Expand All @@ -35,82 +60,59 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------
nanohttpd
================================================================================

nanohttpd efb2ebf

Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010
Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010
by Konstantinos Togias
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.

* Neither the name of the NanoHttpd organization nor the names of its
contributors may be used to endorse or promote products derived from this
* Neither the name of the NanoHttpd organization nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------------------

JSON.org

Copyright (c) 2002 JSON.org

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

The Software shall be used for Good, not Evil.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
================================================================================

-------------------------------------------------------------------------------
ANTLR 4.7.1

ANTLR 4.7
Include the following verbatim in the documentation:

Copyright (c) 2015 Terence Parr, Sam Harwell
All rights reserved.
Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Expand All @@ -123,4 +125,30 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

=====

MIT License for codepointat.js from https://git.io/codepointat
MIT License for fromcodepoint.js from https://git.io/vDW1m

Copyright Mathias Bynens <https://mathiasbynens.be/>

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


6 changes: 4 additions & 2 deletions ci.hocon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ include "truffle/ci.hocon"

#Compiler
compiler-suite-root = "./compiler"
logPatterns = ["*.bgv"]
logPatterns = [
"*.bgv"
${compiler-suite-root}"/graal_dumps/*/*"
]

#Tools
include "tools/ci.hocon"
Expand All @@ -34,7 +37,6 @@ include "compiler/ci_common/common.hocon"
include "compiler/ci_common/gate.hocon"
include "compiler/ci_common/gate_tasks.hocon"
include "compiler/ci_common/gate_tasks_bootstrap.hocon"
include "compiler/ci_includes/deploy.hocon"

include "compiler/ci_common/bench.hocon"
include "compiler/ci_common/bench-hwloc.hocon"
Expand Down
7 changes: 7 additions & 0 deletions ci.jsonnet
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#GraalWasm
local wasm = import 'wasm/ci.jsonnet';

{
builds: wasm.builds
}

28 changes: 20 additions & 8 deletions common.hocon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ overlay = 66a6d5b786a13ffa8d683174192c466d4c94ea5f
# openjdk8 JDKs on Linux are built by Oracle Labs
# openjdk8 JDKs on macOS are based on AdoptOpenJDK binaries
jdks: {
oraclejdk8: {name : oraclejdk, version : "8u221-jvmci-19.3-b03", platformspecific: true}
openjdk8: {name : openjdk, version : "8u222-jvmci-19.3-b03", platformspecific: true}
oraclejdk8Debug: {name : oraclejdk, version : "8u221-jvmci-19.3-b03-fastdebug", platformspecific: true}
oraclejdk8: {name : oraclejdk, version : "8u231-jvmci-19.3-b05", platformspecific: true}
openjdk8: {name : openjdk, version : "8u232-jvmci-19.3-b05", platformspecific: true}
oraclejdk8Debug: {name : oraclejdk, version : "8u231-jvmci-19.3-b05-fastdebug", platformspecific: true}
oraclejdk11: {name : oraclejdk, version : "11.0.3+12", platformspecific: true}
openjdk11: {name : openjdk, version : "11.0.3+7", platformspecific: true}
labsjdk-ce-11: {name : labsjdk, version : "ce-11.0.5+9-jvmci-19.3-b03", platformspecific: true}
labsjdk-ee-11: {name : labsjdk, version : "ee-11.0.5+1-jvmci-19.3-b03", platformspecific: true}
labsjdk-ce-11: {name : labsjdk, version : "ce-11.0.5+10-jvmci-19.3-b05", platformspecific: true}
labsjdk-ee-11: {name : labsjdk, version : "ee-11.0.5+10-jvmci-19.3-b05", platformspecific: true}
}

# This must always point to HEAD in the master branch but can be used to point
Expand All @@ -29,9 +29,10 @@ download-hsdis : {
]
}

oraclejdk8 : { downloads : { JAVA_HOME : ${jdks.oraclejdk8}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk-ee-11} ]} }}
oraclejdk8Only : { downloads : { JAVA_HOME : ${jdks.oraclejdk8} }}
oraclejdk8Debug : { downloads : { JAVA_HOME : ${jdks.oraclejdk8Debug}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk-ee-11} ]} }}
oraclejdk8 : { downloads : { JAVA_HOME : ${jdks.oraclejdk8}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk-ee-11} ]} }}
oraclejdk8Only : { downloads : { JAVA_HOME : ${jdks.oraclejdk8} }}
oraclejdk8Debug : { downloads : { JAVA_HOME : ${jdks.oraclejdk8Debug}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk-ee-11} ]} }}
oraclejdk8OnlyDebug : { downloads : { JAVA_HOME : ${jdks.oraclejdk8Debug} }}

openjdk8 : { downloads : { JAVA_HOME : ${jdks.openjdk8} }}

Expand All @@ -47,6 +48,7 @@ common : ${mx} {
"Graal diagnostic output saved in (?P<filename>.+\.zip)"
]
packages : {
"pip:logilab-common ": "==1.4.4"
"pip:astroid" : "==1.1.0"
"pip:pylint" : "==1.1.0"
"pip:ninja_syntax" : "==1.7.2"
Expand Down Expand Up @@ -203,6 +205,16 @@ svm-common-windows: ${svm-common} ${windows-amd64} {
timelimit: "45:00"
}

windows-devkit-jdk11: {
packages : {
"devkit:VS2017-15.5.5+1" : "==0"
}
}

svm-common-windows-jdk11: ${svm-common} ${windows-amd64} ${windows-devkit-jdk11} {
timelimit: "45:00"
}

svm-common-sulong: {
packages: {
llvm: "==6.0.1"
Expand Down
Loading

0 comments on commit d111e90

Please sign in to comment.