Update OpenJDK to 11.0.15+8-mmtk (#153)

* Update OpenJDK to 11.0.15+8-mmtk
* Add check for OpenJDK version to build

Author: k-sareen

mmtk/Cargo.toml

@@ -16,7 +16,7 @@ lto = true
 [package.metadata.openjdk]
 # Our CI matches the following line and extract mmtk/openjdk. If this line is updated, please check ci yaml files and make sure it works.
 openjdk_repo = "https://github.com/mmtk/openjdk.git"
-openjdk_version = "67d5d2b16aacb2ea948552fab2323ebd0abbe924"
+openjdk_version = "ca90b43f0f51d9ddf754e6ab134c5030cf54118b"
 
 [dependencies]
 libc = "0.2"

openjdk/CompileThirdPartyHeap.gmk

@@ -1,7 +1,15 @@
+# Misc variables
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
 # THIRD_PARTY_HEAP points to mmtk-openjdk/openjdk
 MMTK_RUST_ROOT = $(THIRD_PARTY_HEAP)/../mmtk
 MMTK_CPP_ROOT = $(THIRD_PARTY_HEAP)
 
+# Grab OpenJDK version specified in mmtk/Cargo.toml and local OpenJDK version
+OPENJDK_VERSION=`cd $(MMTK_RUST_ROOT) ; cargo read-manifest --manifest-path=Cargo.toml | python -c 'import json,sys; print(json.load(sys.stdin)["metadata"]["openjdk"]["openjdk_version"])'`
+OPENJDK_LOCAL_VERSION=`git rev-parse HEAD`
+
 ifdef MMTK_PLAN
   GC_FEATURES=--features $(MMTK_PLAN)
 endif
@@ -40,6 +48,11 @@ else
 endif
 
 $(LIB_MMTK): FORCE
+	if [[ "$(OPENJDK_VERSION)" != "$(OPENJDK_LOCAL_VERSION)" ]]; then \
+		echo -e $(YELLOW)WARNING: Local OpenJDK version does not match version specified in mmtk/Cargo.toml$(NC); \
+		echo -e $(YELLOW)Local OpenJDK version $(OPENJDK_LOCAL_VERSION)$(NC); \
+		echo -e $(YELLOW)mmtk/Cargo.toml OpenJDK version $(OPENJDK_VERSION)$(NC); \
+	fi
 	echo "cd $(MMTK_RUST_ROOT) && cargo build $(CARGO_PROFILE_FLAG) $(GC_FEATURES)"
 	cd $(MMTK_RUST_ROOT) && cargo build $(CARGO_PROFILE_FLAG) $(GC_FEATURES)
 	cp $(MMTK_RUST_ROOT)/target/$(CARGO_PROFILE)/libmmtk_openjdk.so $(LIB_MMTK)