--- old/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2013-07-31 20:08:07.035259380 +0200
+++ new/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2013-07-31 20:08:06.543259400 +0200
@@ -481,9 +481,8 @@
 
 ConcurrentMark::ConcurrentMark(G1CollectedHeap* g1h, ReservedSpace heap_rs) :
   _g1h(g1h),
-  _markBitMap1(MinObjAlignment - 1),
-  _markBitMap2(MinObjAlignment - 1),
-
+  _markBitMap1(LogMinObjAlignment),
+  _markBitMap2(LogMinObjAlignment),
   _parallel_marking_threads(0),
   _max_parallel_marking_threads(0),
   _sleep_factor(0.0),
--- /dev/null	2013-07-24 22:14:39.547929557 +0200
+++ new/test/gc/g1/TestObjectAlignment.java	2013-07-31 20:08:09.031259301 +0200
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test TestObjectAlignment
+ * @key gc
+ * @bug 8021823
+ * @summary G1: Concurrent marking crashes with -XX:ObjectAlignmentInBytes>=32 in 64bit VMs
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.ProcessTools;
+import com.oracle.java.testlibrary.OutputAnalyzer;
+
+public class TestObjectAlignment {
+
+  private static boolean runsOn32bit() {
+    return System.getProperty("sun.arch.data.model").equals("32");
+  }
+
+  public static void runTest(int objectAlignment) throws Exception {
+    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
+                                                              "-Xmx20M",
+                                                              "-XX:+ExplicitGCInvokesConcurrent",
+                                                              "-XX:ObjectAlignmentInBytes=" + objectAlignment,
+                                                              TestObjectAlignmentTest.class.getName());
+    OutputAnalyzer output = new OutputAnalyzer(pb.start());
+    output.shouldHaveExitValue(0);
+  }
+
+  public static void main(String[] args) throws Exception {
+    if (runsOn32bit()) {
+      // 32 bit VMs do not allow setting ObjectAlignmentInBytes.
+      return;
+    }
+    runTest(8);
+    runTest(16);
+    runTest(32);
+    runTest(64);
+    runTest(128);
+    runTest(256);
+  }
+
+  static class TestObjectAlignmentTest {
+    static byte[] garbage;
+
+    public static void main(String [] args) {
+      for (int i = 0; i < 100; i++) {
+        garbage = new byte[1000];
+        System.gc();
+      }
+    }
+  }
+}