diff options
-rw-r--r-- | Makefile | 10 | ||||
-rw-r--r-- | benchmarks/parsetoproto2.upb.cc | 3 |
2 files changed, 6 insertions, 7 deletions
@@ -289,7 +289,9 @@ UPB_BENCHMARKS += \ benchmarks/b.parsestream_googlemessage1.upb_jit \ benchmarks/b.parsestream_googlemessage2.upb_jit \ benchmarks/b.parsetostruct_googlemessage1.upb_jit_byval \ - benchmarks/b.parsetostruct_googlemessage2.upb_jit_byval + benchmarks/b.parsetostruct_googlemessage2.upb_jit_byval \ + benchmarks/b.parsetoproto2_googlemessage1.upb_jit \ + benchmarks/b.parsetoproto2_googlemessage2.upb_jit endif BENCHMARKS=$(UPB_BENCHMARKS) \ @@ -300,12 +302,6 @@ BENCHMARKS=$(UPB_BENCHMARKS) \ benchmarks/b.parsetoproto2_googlemessage1.upb \ benchmarks/b.parsetoproto2_googlemessage2.upb -ifdef USE_JIT -BENCHMARKS += \ - benchmarks/b.parsetoproto2_googlemessage1.upb_jit \ - benchmarks/b.parsetoproto2_googlemessage2.upb_jit -endif - upb_benchmarks: $(UPB_BENCHMARKS) benchmarks: $(BENCHMARKS) benchmark: diff --git a/benchmarks/parsetoproto2.upb.cc b/benchmarks/parsetoproto2.upb.cc index e60c5d5..af3e1f2 100644 --- a/benchmarks/parsetoproto2.upb.cc +++ b/benchmarks/parsetoproto2.upb.cc @@ -86,6 +86,9 @@ class UpbRepeatedPtrField : public google::protobuf::internal::RepeatedPtrFieldB class TypeHandler { public: typedef void Type; + // AddAllocated() calls this, but only if other objects are sitting + // around waiting for reuse, which we will not do. + static void Delete(Type*) { assert(false); } }; void *Add(google::protobuf::Message *m) { void *submsg = RepeatedPtrFieldBase::AddFromCleared<TypeHandler>(); |