Remove dangling semicolons in cpp outputs

Bug: none
Test: golden_test.sh
Change-Id: Iceb3fb9ba1d8720afb2f343d903281669f1c5dee

6 files changed, 102 insertions, 103 deletions

diff --git a/generate_cpp.cpp b/generate_cpp.cpp
index 58f87e21..7168ee5b 100644
--- a/generate_cpp.cpp
+++ b/generate_cpp.cpp
@@ -1122,16 +1122,18 @@ void BuildReadFromParcel(const AidlStructuredParcelable& parcel, const AidlTypen
       "if (_aidl_parcelable_raw_size < 0) return ::android::BAD_VALUE;\n"
       "[[maybe_unused]] size_t _aidl_parcelable_size = "
       "static_cast<size_t>(_aidl_parcelable_raw_size);\n"
-      "if (_aidl_start_pos > SIZE_MAX - _aidl_parcelable_size) return ::android::BAD_VALUE;\n");
+      "if (_aidl_start_pos > SIZE_MAX - _aidl_parcelable_size) return ::android::BAD_VALUE;\n",
+      /*add_semicolon=*/false);
 
   auto checkAvailableData = StringPrintf(
       "if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {\n"
       "  _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);\n"
       "  return %s;\n"
-      "}",
+      "}\n",
       kAndroidStatusVarName);
+
   for (const auto& variable : parcel.GetFields()) {
-    read_block->AddLiteral(checkAvailableData);
+    read_block->AddLiteral(checkAvailableData, /*add_semicolon=*/false);
     string method = ParcelReadMethodOf(variable->GetType(), typenames);
     read_block->AddStatement(new Assignment(
         kAndroidStatusVarName, new MethodCall(StringPrintf("_aidl_parcel->%s", method.c_str()),
@@ -1150,7 +1152,8 @@ void BuildWriteToParcel(const AidlStructuredParcelable& parcel, const AidlTypena
 
   write_block->AddLiteral(
       "auto _aidl_start_pos = _aidl_parcel->dataPosition();\n"
-      "_aidl_parcel->writeInt32(0);");
+      "_aidl_parcel->writeInt32(0);\n",
+      /*add_semicolon=*/false);
 
   for (const auto& variable : parcel.GetFields()) {
     string method = ParcelWriteMethodOf(variable->GetType(), typenames);
@@ -1165,7 +1168,8 @@ void BuildWriteToParcel(const AidlStructuredParcelable& parcel, const AidlTypena
       "auto _aidl_end_pos = _aidl_parcel->dataPosition();\n"
       "_aidl_parcel->setDataPosition(_aidl_start_pos);\n"
       "_aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos);\n"
-      "_aidl_parcel->setDataPosition(_aidl_end_pos);");
+      "_aidl_parcel->setDataPosition(_aidl_end_pos);\n",
+      /*add_semicolon=*/false);
   write_block->AddLiteral(StringPrintf("return %s", kAndroidStatusVarName));
 }
 
diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp
index 5ee87ace..d6a7d643 100644
--- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp
+++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp
@@ -13,11 +13,10 @@ namespace tests {
   if (_aidl_parcelable_raw_size < 0) return ::android::BAD_VALUE;
   [[maybe_unused]] size_t _aidl_parcelable_size = static_cast<size_t>(_aidl_parcelable_raw_size);
   if (_aidl_start_pos > SIZE_MAX - _aidl_parcelable_size) return ::android::BAD_VALUE;
-  ;
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readString16(&field);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -29,7 +28,7 @@ namespace tests {
 ::android::status_t OtherParcelableForToString::writeToParcel(::android::Parcel* _aidl_parcel) const {
   ::android::status_t _aidl_ret_status = ::android::OK;
   auto _aidl_start_pos = _aidl_parcel->dataPosition();
-  _aidl_parcel->writeInt32(0);;
+  _aidl_parcel->writeInt32(0);
   _aidl_ret_status = _aidl_parcel->writeString16(field);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -37,7 +36,7 @@ namespace tests {
   auto _aidl_end_pos = _aidl_parcel->dataPosition();
   _aidl_parcel->setDataPosition(_aidl_start_pos);
   _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos);
-  _aidl_parcel->setDataPosition(_aidl_end_pos);;
+  _aidl_parcel->setDataPosition(_aidl_end_pos);
   return _aidl_ret_status;
 }
 
diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp
index 4882b7df..7b40910d 100644
--- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp
+++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp
@@ -13,11 +13,10 @@ namespace tests {
   if (_aidl_parcelable_raw_size < 0) return ::android::BAD_VALUE;
   [[maybe_unused]] size_t _aidl_parcelable_size = static_cast<size_t>(_aidl_parcelable_raw_size);
   if (_aidl_start_pos > SIZE_MAX - _aidl_parcelable_size) return ::android::BAD_VALUE;
-  ;
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&intValue);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -25,7 +24,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32Vector(&intArray);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -33,7 +32,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt64(&longValue);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -41,7 +40,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt64Vector(&longArray);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -49,7 +48,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readDouble(&doubleValue);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -57,7 +56,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readDoubleVector(&doubleArray);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -65,7 +64,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readFloat(&floatValue);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -73,7 +72,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readFloatVector(&floatArray);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -81,7 +80,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readByte(&byteValue);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -89,7 +88,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readByteVector(&byteArray);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -97,7 +96,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readBool(&booleanValue);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -105,7 +104,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readBoolVector(&booleanArray);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -113,7 +112,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readString16(&stringValue);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -121,7 +120,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readString16Vector(&stringArray);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -129,7 +128,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readString16Vector(&stringList);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -137,7 +136,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readParcelable(&parcelableValue);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -145,7 +144,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readParcelableVector(&parcelableArray);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -153,7 +152,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&enumValue));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -161,7 +160,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readEnumVector(&enumArray);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -169,7 +168,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readString16Vector(&nullArray);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -177,7 +176,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readString16Vector(&nullList);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -185,7 +184,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readParcelable(&parcelableGeneric);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -193,7 +192,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readParcelable(&unionValue);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -205,7 +204,7 @@ namespace tests {
 ::android::status_t ParcelableForToString::writeToParcel(::android::Parcel* _aidl_parcel) const {
   ::android::status_t _aidl_ret_status = ::android::OK;
   auto _aidl_start_pos = _aidl_parcel->dataPosition();
-  _aidl_parcel->writeInt32(0);;
+  _aidl_parcel->writeInt32(0);
   _aidl_ret_status = _aidl_parcel->writeInt32(intValue);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -301,7 +300,7 @@ namespace tests {
   auto _aidl_end_pos = _aidl_parcel->dataPosition();
   _aidl_parcel->setDataPosition(_aidl_start_pos);
   _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos);
-  _aidl_parcel->setDataPosition(_aidl_end_pos);;
+  _aidl_parcel->setDataPosition(_aidl_end_pos);
   return _aidl_ret_status;
 }
 
diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp
index c73c02da..cc0f2f1b 100644
--- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp
+++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp
@@ -13,11 +13,10 @@ namespace tests {
   if (_aidl_parcelable_raw_size < 0) return ::android::BAD_VALUE;
   [[maybe_unused]] size_t _aidl_parcelable_size = static_cast<size_t>(_aidl_parcelable_raw_size);
   if (_aidl_start_pos > SIZE_MAX - _aidl_parcelable_size) return ::android::BAD_VALUE;
-  ;
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32Vector(&shouldContainThreeFs);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -25,7 +24,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&f);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -33,7 +32,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readUtf8FromUtf16(&shouldBeJerry);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -41,7 +40,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readByte(reinterpret_cast<int8_t *>(&shouldBeByteBar));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -49,7 +48,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&shouldBeIntBar));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -57,7 +56,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt64(reinterpret_cast<int64_t *>(&shouldBeLongBar));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -65,7 +64,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readEnumVector(&shouldContainTwoByteFoos);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -73,7 +72,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readEnumVector(&shouldContainTwoIntFoos);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -81,7 +80,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readEnumVector(&shouldContainTwoLongFoos);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -89,7 +88,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readString16(&stringDefaultsToFoo);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -97,7 +96,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readByte(&byteDefaultsToFour);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -105,7 +104,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&intDefaultsToFive);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -113,7 +112,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt64(&longDefaultsToNegativeSeven);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -121,7 +120,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readBool(&booleanDefaultsToTrue);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -129,7 +128,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readChar(&charDefaultsToC);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -137,7 +136,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readFloat(&floatDefaultsToPi);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -145,7 +144,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readDouble(&doubleWithDefault);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -153,7 +152,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32Vector(&arrayDefaultsTo123);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -161,7 +160,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32Vector(&arrayDefaultsToEmpty);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -169,7 +168,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readBool(&boolDefault);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -177,7 +176,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readByte(&byteDefault);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -185,7 +184,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&intDefault);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -193,7 +192,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt64(&longDefault);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -201,7 +200,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readFloat(&floatDefault);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -209,7 +208,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readDouble(&doubleDefault);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -217,7 +216,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readDouble(&checkDoubleFromFloat);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -225,7 +224,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readString16Vector(&checkStringArray1);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -233,7 +232,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readUtf8VectorFromUtf16Vector(&checkStringArray2);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -241,7 +240,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&int32_min);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -249,7 +248,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&int32_max);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -257,7 +256,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt64(&int64_max);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -265,7 +264,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&hexInt32_neg_1);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -273,7 +272,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readNullableStrongBinder(&ibinder);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -281,7 +280,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32Vector(&int32_1);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -289,7 +288,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt64Vector(&int64_1);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -297,7 +296,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&hexInt32_pos_1);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -305,7 +304,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&hexInt64_pos_1);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -313,7 +312,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&const_exprs_1));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -321,7 +320,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&const_exprs_2));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -329,7 +328,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&const_exprs_3));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -337,7 +336,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&const_exprs_4));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -345,7 +344,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&const_exprs_5));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -353,7 +352,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&const_exprs_6));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -361,7 +360,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&const_exprs_7));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -369,7 +368,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&const_exprs_8));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -377,7 +376,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&const_exprs_9));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -385,7 +384,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&const_exprs_10));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -393,7 +392,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readUtf8FromUtf16(&addString1);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -401,7 +400,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readUtf8FromUtf16(&addString2);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -409,7 +408,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&shouldSetBit0AndBit2);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -417,7 +416,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readParcelable(&u);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -425,7 +424,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readParcelable(&shouldBeConstS1);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -433,7 +432,7 @@ namespace tests {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(reinterpret_cast<int32_t *>(&defaultWithFoo));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -445,7 +444,7 @@ namespace tests {
 ::android::status_t StructuredParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const {
   ::android::status_t _aidl_ret_status = ::android::OK;
   auto _aidl_start_pos = _aidl_parcel->dataPosition();
-  _aidl_parcel->writeInt32(0);;
+  _aidl_parcel->writeInt32(0);
   _aidl_ret_status = _aidl_parcel->writeInt32Vector(shouldContainThreeFs);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -661,7 +660,7 @@ namespace tests {
   auto _aidl_end_pos = _aidl_parcel->dataPosition();
   _aidl_parcel->setDataPosition(_aidl_start_pos);
   _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos);
-  _aidl_parcel->setDataPosition(_aidl_end_pos);;
+  _aidl_parcel->setDataPosition(_aidl_end_pos);
   return _aidl_ret_status;
 }
 
diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h
index f64aba32..e5efd0e0 100644
--- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h
+++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h
@@ -74,11 +74,10 @@ template <typename T, typename U, typename B>
   if (_aidl_parcelable_raw_size < 0) return ::android::BAD_VALUE;
   [[maybe_unused]] size_t _aidl_parcelable_size = static_cast<size_t>(_aidl_parcelable_raw_size);
   if (_aidl_start_pos > SIZE_MAX - _aidl_parcelable_size) return ::android::BAD_VALUE;
-  ;
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&a);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -86,7 +85,7 @@ template <typename T, typename U, typename B>
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&b);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -99,7 +98,7 @@ template <typename T, typename U, typename B>
 ::android::status_t GenericStructuredParcelable<T,U,B>::writeToParcel(::android::Parcel* _aidl_parcel) const {
   ::android::status_t _aidl_ret_status = ::android::OK;
   auto _aidl_start_pos = _aidl_parcel->dataPosition();
-  _aidl_parcel->writeInt32(0);;
+  _aidl_parcel->writeInt32(0);
   _aidl_ret_status = _aidl_parcel->writeInt32(a);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -111,7 +110,7 @@ template <typename T, typename U, typename B>
   auto _aidl_end_pos = _aidl_parcel->dataPosition();
   _aidl_parcel->setDataPosition(_aidl_start_pos);
   _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos);
-  _aidl_parcel->setDataPosition(_aidl_end_pos);;
+  _aidl_parcel->setDataPosition(_aidl_end_pos);
   return _aidl_ret_status;
 }
 
diff --git a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp
index 789aac0e..b38dae48 100644
--- a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp
+++ b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp
@@ -13,11 +13,10 @@ namespace loggable {
   if (_aidl_parcelable_raw_size < 0) return ::android::BAD_VALUE;
   [[maybe_unused]] size_t _aidl_parcelable_size = static_cast<size_t>(_aidl_parcelable_raw_size);
   if (_aidl_start_pos > SIZE_MAX - _aidl_parcelable_size) return ::android::BAD_VALUE;
-  ;
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readInt32(&num);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -25,7 +24,7 @@ namespace loggable {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readUtf8FromUtf16(&str);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -33,7 +32,7 @@ namespace loggable {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readParcelable(&nestedUnion);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -41,7 +40,7 @@ namespace loggable {
   if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) {
     _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size);
     return _aidl_ret_status;
-  };
+  }
   _aidl_ret_status = _aidl_parcel->readByte(reinterpret_cast<int8_t *>(&nestedEnum));
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -53,7 +52,7 @@ namespace loggable {
 ::android::status_t Data::writeToParcel(::android::Parcel* _aidl_parcel) const {
   ::android::status_t _aidl_ret_status = ::android::OK;
   auto _aidl_start_pos = _aidl_parcel->dataPosition();
-  _aidl_parcel->writeInt32(0);;
+  _aidl_parcel->writeInt32(0);
   _aidl_ret_status = _aidl_parcel->writeInt32(num);
   if (((_aidl_ret_status) != (::android::OK))) {
     return _aidl_ret_status;
@@ -73,7 +72,7 @@ namespace loggable {
   auto _aidl_end_pos = _aidl_parcel->dataPosition();
   _aidl_parcel->setDataPosition(_aidl_start_pos);
   _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos);
-  _aidl_parcel->setDataPosition(_aidl_end_pos);;
+  _aidl_parcel->setDataPosition(_aidl_end_pos);
   return _aidl_ret_status;
 }