Merge pull request #3009 from xTachyon/bettercpp

Serialized ATN const array generates horrible machine code fix

contributors.txt

@@ -289,3 +289,4 @@ YYYY/MM/DD, github id, Full name, email
 2021/02/21, namasikanam, Xingyu Xie, namasikanam@gmail.com
 2021/02/27, khmarbaise, Karl Heinz Marbaise, github@soebes.com
 2021/03/02, hackeris
+2021/03/03, xTachyon, Damian Andrei, xTachyon@users.noreply.github.com

tool/resources/org/antlr/v4/tool/templates/codegen/Cpp/Cpp.stg

@@ -422,22 +422,14 @@ static std::vector\<uint16_t> _serializedATN;
 
 // Constructs the serialized ATN and writes init code for static member vars.
 SerializedATN(model) ::= <<
-<if (rest(model.segments))>
-<model.segments: {segment | static uint16_t serializedATNSegment<i0>[] = {
+<model.segments: {segment | static const uint16_t serializedATNSegment<i0>[] = {
   <segment; wrap={<\n>   }>
 \};}; separator="\n">
 
 <model.segments: {segment | _serializedATN.insert(_serializedATN.end(), serializedATNSegment<i0>,
   serializedATNSegment<i0> + sizeof(serializedATNSegment<i0>) / sizeof(serializedATNSegment<i0>[0]));
 }>
 
-<else>
-<! only one segment, can be inlined !>
-_serializedATN = {
-  <model.serialized; wrap = {<\n>}>
-};
-<endif>
-
 atn::ATNDeserializer deserializer;
 _atn = deserializer.deserialize(_serializedATN);