From c0da82a6b8fc14766044b8bddd4067db9c11fab4 Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Thu, 2 Oct 2014 12:19:34 -0400
Subject: [PATCH] assertions

---
 compiler/src/main/cpp/capnpc-java.c++                | 12 ++++++++----
 runtime/src/main/java/org/capnproto/WireHelpers.java |  8 ++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/compiler/src/main/cpp/capnpc-java.c++ b/compiler/src/main/cpp/capnpc-java.c++
index 6eb0a76..abc7724 100644
--- a/compiler/src/main/cpp/capnpc-java.c++
+++ b/compiler/src/main/cpp/capnpc-java.c++
@@ -604,10 +604,10 @@ private:
     return DiscriminantChecks {
       kj::str(spaces(indent),
               "  if (which() != ", scope, "Which.", upperCase, ") return false;\n"),
-        kj::str(), // XXX
-        //kj::str(
-        //  "  KJ_IREQUIRE(which() == ", scope, upperCase, ",\n"
-        //  "              \"Must check which() before get()ing a union member.\");\n"),
+        kj::str(
+          spaces(indent),
+          "  assert which() == ", scope, "Which.", upperCase, ":\n",
+          spaces(indent), "              \"Must check which() before get()ing a union member.\";\n"),
         kj::str(
           spaces(indent), "  _builder.setShortField(", discrimOffset, ", (short)",
           scope, "Which.", upperCase, ".ordinal());\n"),
@@ -835,6 +835,7 @@ private:
         kj::strTree(
             kj::mv(unionDiscrim.readerIsDecl),
             spaces(indent), "  public final ", type, " get", titleCase, "() {\n",
+            unionDiscrim.check,
             (typeBody.which() == schema::Type::ENUM ?
              makeEnumGetter(structSchema.getDependency(typeBody.getEnum().getTypeId()).asEnum(),
                             kj::str("_reader"), offset, indent + 2) :
@@ -847,6 +848,7 @@ private:
           kj::strTree(
             kj::mv(unionDiscrim.builderIsDecl),
             spaces(indent), "  public final ", type, " get", titleCase, "() {\n",
+            unionDiscrim.check,
             (typeBody.which() == schema::Type::ENUM ?
              makeEnumGetter(structSchema.getDependency(typeBody.getEnum().getTypeId()).asEnum(),
                             kj::str("_builder"), offset, indent + 2) :
@@ -923,6 +925,7 @@ private:
           spaces(indent), "  }\n",
 
           spaces(indent), "  public ", type, ".Reader get", titleCase, "() {\n",
+          unionDiscrim.check,
           spaces(indent), "    return ", type,
           ".factory.fromStructReader(_reader.getPointerField(", offset,").getStruct());\n",
           spaces(indent), "  }\n", "\n"),
@@ -930,6 +933,7 @@ private:
         kj::strTree(
           kj::mv(unionDiscrim.builderIsDecl),
           spaces(indent), "  public final ", type, ".Builder get", titleCase, "() {\n",
+          unionDiscrim.check,
           spaces(indent), "    return ", type,
           ".factory.fromStructBuilder(_builder.getPointerField(", offset, ").getStruct(",
           type, ".STRUCT_SIZE", "));\n",
diff --git a/runtime/src/main/java/org/capnproto/WireHelpers.java b/runtime/src/main/java/org/capnproto/WireHelpers.java
index 319a56c..23c2593 100644
--- a/runtime/src/main/java/org/capnproto/WireHelpers.java
+++ b/runtime/src/main/java/org/capnproto/WireHelpers.java
@@ -181,9 +181,7 @@ final class WireHelpers {
                                               SegmentBuilder segment,
                                               int elementCount,
                                               byte elementSize) {
-        if (elementSize == FieldSize.INLINE_COMPOSITE) {
-            throw new InternalError("Should have called initStructListPointer instead");
-        }
+        assert elementSize == FieldSize.INLINE_COMPOSITE : "Should have called initStructListPointer instead";
 
         int dataSize = FieldSize.dataBitsPerElement(elementSize);
         int pointerCount = FieldSize.pointersPerElement(elementSize);
@@ -230,9 +228,7 @@ final class WireHelpers {
     public static ListBuilder getWritableListPointer(int origRefOffset,
                                                      SegmentBuilder origSegment,
                                                      byte elementSize) {
-        if (elementSize == FieldSize.INLINE_COMPOSITE) {
-            throw new InternalError("Use getStructList{Element,Field} for structs");
-        }
+        assert elementSize == FieldSize.INLINE_COMPOSITE : "Use getStructList{Element,Field} for structs";
 
         long origRef = WirePointer.get(origSegment.buffer, origRefOffset);
         int origRefTarget = WirePointer.target(origRefOffset, origRef);