From a71e75140eb25386aabefc0712feb749a59bde87 Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Fri, 11 Apr 2014 19:48:06 -0600
Subject: [PATCH] fix Android bootimage build

bb86500 was a step in the right direction, but there was a bug that
caused Type_pad fields to be inserted between every other field in for
a derived class when type-maps.cpp was generated, and this led to
miscompilation of e.g. Android's
java.lang.reflect.Constructor.getModifiers.
---
 src/tools/type-generator/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tools/type-generator/main.cpp b/src/tools/type-generator/main.cpp
index 2d436b3c93..887b5117e9 100644
--- a/src/tools/type-generator/main.cpp
+++ b/src/tools/type-generator/main.cpp
@@ -1839,6 +1839,7 @@ writeMap(Output* out, Object* type)
     Object* m = it.next();
 
     if (it.sawSuperclassBoundary) {
+      it.sawSuperclassBoundary = false;
       out->write("Type_pad, ");
     }