From 95787f1e55353783cfa2befe3f95aa028644161d Mon Sep 17 00:00:00 2001 From: Vaci Koblizek Date: Thu, 5 Nov 2020 17:34:14 +0000 Subject: [PATCH] skip non-generic nodes when traversing for generic params Fixes pipeline generation for TestGenericsWrapper2. --- compiler/src/main/cpp/capnpc-java.c++ | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/src/main/cpp/capnpc-java.c++ b/compiler/src/main/cpp/capnpc-java.c++ index 77123ff..78935e0 100644 --- a/compiler/src/main/cpp/capnpc-java.c++ +++ b/compiler/src/main/cpp/capnpc-java.c++ @@ -245,10 +245,12 @@ private: Schema parent = schemaLoader.get(node.getScopeId()); result = getTypeArguments(leaf, parent, kj::str(suffix)); } - auto brandArguments = leaf.getBrandArgumentsAtScope(node.getId()); - auto parameters = node.getParameters(); - for (int ii = 0; ii < parameters.size(); ++ii) { - result.add(typeName(brandArguments[ii], kj::str(suffix)).flatten()); + if (node.getIsGeneric()) { + auto brandArguments = leaf.getBrandArgumentsAtScope(node.getId()); + auto parameters = node.getParameters(); + for (int ii = 0; ii < parameters.size(); ++ii) { + result.add(typeName(brandArguments[ii], kj::str(suffix)).flatten()); + } } return kj::mv(result); }