diff --git a/.github/workflows/check_pr.yml b/.github/workflows/check_pr.yml
index 46d444a408b1a661d06e0af1b71f42439485720d..f7672c29fb11034ac02119564bf4c7867c1a62be 100644
--- a/.github/workflows/check_pr.yml
+++ b/.github/workflows/check_pr.yml
@@ -46,6 +46,22 @@ jobs:
           TEST_JDK_HOME=build/linux-x86_64-normal-server-release/images/jdk
           ${TEST_JDK_HOME}/bin/java -version
 
+  build_fastdebug_jdk:
+    runs-on: ubuntu-latest
+    container:
+      image: docker.io/dragonwelljdk/build_jdk:11u
+    steps:
+      - uses: actions/checkout@v2
+      - name: Compile fastdebug mode
+        run: |
+          chmod 755 configure
+          bash make.sh fastdebug
+
+      - name: Sanity test
+        run: |
+          TEST_JDK_HOME=build/linux-x86_64-normal-server-fastdebug/images/jdk
+          ${TEST_JDK_HOME}/bin/java -version
+
   build_slowdebug_jdk:
     runs-on: ubuntu-latest
     container:
diff --git a/make.sh b/make.sh
index c2cddbe49343b9d350b552861522e601fa812dde..d7851a545394c46ddc65d7edebf30a93065e5aa6 100755
--- a/make.sh
+++ b/make.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# != 1 ]; then
-  echo "USAGE: $0 release/debug"
+  echo "USAGE: $0 release/debug/fastdebug"
   exit
 fi
 
@@ -19,8 +19,12 @@ case "${BUILD_MODE}" in
         DEBUG_LEVEL="slowdebug"
         JDK_IMAGES_DIR=`pwd`/build/linux-x86_64-normal-server-slowdebug/images
     ;;
+    fastdebug)
+        DEBUG_LEVEL="fastdebug"
+        JDK_IMAGES_DIR=`pwd`/build/linux-x86_64-normal-server-fastdebug/images
+    ;;
     *)
-        echo "Argument must be release or debug!"
+        echo "Argument must be release or debug or fastdebug!"
         exit 1
     ;;
 esac
diff --git a/src/hotspot/share/gc/shared/allocTracer.inline.hpp b/src/hotspot/share/gc/shared/allocTracer.inline.hpp
index 09dddd9a0bd43482458a90c1accdee148be292c3..63fb4ce3d0b4b9e1ff50f07b2495c93fb163795b 100644
--- a/src/hotspot/share/gc/shared/allocTracer.inline.hpp
+++ b/src/hotspot/share/gc/shared/allocTracer.inline.hpp
@@ -57,7 +57,7 @@ inline void AllocTracer::send_opto_array_allocation_event(Klass* klass, oop obj,
   EventOptoArrayObjectAllocation event;
   if (event.should_commit()) {
     event.set_objectClass(klass);
-    event.set_address((TraceAddress)obj);
+    event.set_address(cast_from_oop<TraceAddress>(obj));
     event.set_allocationSize(alloc_size);
     event.commit();
   }
@@ -67,7 +67,7 @@ inline void AllocTracer::send_opto_instance_allocation_event(Klass* klass, oop o
   EventOptoInstanceObjectAllocation event;
   if (event.should_commit()) {
     event.set_objectClass(klass);
-    event.set_address((TraceAddress)obj);
+    event.set_address(cast_from_oop<TraceAddress>(obj));
     event.commit();
   }
 }