From 02cfe068507a2d93ae9f2c41690cb6b2aa9f1464 Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Fri, 27 Feb 2015 13:59:06 -0700
Subject: [PATCH] fix OpenJDK 8 class library build

---
 src/classpath-openjdk.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/classpath-openjdk.cpp b/src/classpath-openjdk.cpp
index 4ec3c3c423..3a37a74d1c 100644
--- a/src/classpath-openjdk.cpp
+++ b/src/classpath-openjdk.cpp
@@ -2400,20 +2400,20 @@ object makeJmethod(Thread* t,
                      0,
                      0,
                      declaredAnnotations,
-                     clazz,
+                     cast<GcJclass>(t, clazz),
                      slot,
-                     name,
-                     returnType,
+                     cast<GcString>(t, name),
+                     cast<GcJclass>(t, returnType),
                      parameterTypes,
                      exceptionTypes,
                      modifiers,
-                     signature,
+                     cast<GcString>(t, signature),
                      genericInfo,
-                     annotations,
-                     parameterAnnotations,
-                     annotationDefault,
+                     cast<GcByteArray>(t, annotations),
+                     cast<GcByteArray>(t, parameterAnnotations),
+                     cast<GcByteArray>(t, annotationDefault),
                      methodAccessor,
-                     root);
+                     cast<GcJmethod>(t, root));
 }
 
 object makeJconstructor(Thread* t,
@@ -2438,17 +2438,17 @@ object makeJconstructor(Thread* t,
                           0,
                           0,
                           declaredAnnotations,
-                          clazz,
+                          cast<GcJclass>(t, clazz),
                           slot,
                           parameterTypes,
                           exceptionTypes,
                           modifiers,
-                          signature,
+                          cast<GcString>(t, signature),
                           genericInfo,
-                          annotations,
-                          parameterAnnotations,
+                          cast<GcByteArray>(t, annotations),
+                          cast<GcByteArray>(t, parameterAnnotations),
                           constructorAccessor,
-                          root);
+                          cast<GcJconstructor>(t, root));
 }
 #endif  // HAVE_JexecutableHasRealParameterData