Address review feedback

Author: tbaederr

clang/lib/AST/Interp/ByteCodeEmitter.cpp

@@ -210,9 +210,11 @@ static void emit(Program &P, std::vector<std::byte> &Code, const T &Val,
   }
 }
 
-template <>
-void emit(Program &P, std::vector<std::byte> &Code, const Floating &Val,
-          bool &Success) {
+/// Emits a serializable value. These usually (potentially) contain
+/// heap-allocated memory and aren't trivially copyable.
+template <typename T>
+static void emitSerialized(std::vector<std::byte> &Code, const T &Val,
+                           bool &Success) {
   size_t Size = Val.bytesToSerialize();
 
   if (Code.size() + Size > std::numeric_limits<unsigned>::max()) {
@@ -229,40 +231,22 @@ void emit(Program &P, std::vector<std::byte> &Code, const Floating &Val,
   Val.serialize(Code.data() + ValPos);
 }
 
+template <>
+void emit(Program &P, std::vector<std::byte> &Code, const Floating &Val,
+          bool &Success) {
+  emitSerialized(Code, Val, Success);
+}
+
 template <>
 void emit(Program &P, std::vector<std::byte> &Code,
           const IntegralAP<false> &Val, bool &Success) {
-  size_t Size = Val.bytesToSerialize();
-
-  if (Code.size() + Size > std::numeric_limits<unsigned>::max()) {
-    Success = false;
-    return;
-  }
-
-  // Access must be aligned!
-  size_t ValPos = align(Code.size());
-  Size = align(Size);
-  assert(aligned(ValPos + Size));
-  Code.resize(ValPos + Size);
-  Val.serialize(Code.data() + ValPos);
+  emitSerialized(Code, Val, Success);
 }
 
 template <>
 void emit(Program &P, std::vector<std::byte> &Code, const IntegralAP<true> &Val,
           bool &Success) {
-  size_t Size = Val.bytesToSerialize();
-
-  if (Code.size() + Size > std::numeric_limits<unsigned>::max()) {
-    Success = false;
-    return;
-  }
-
-  // Access must be aligned!
-  size_t ValPos = align(Code.size());
-  Size = align(Size);
-  assert(aligned(ValPos + Size));
-  Code.resize(ValPos + Size);
-  Val.serialize(Code.data() + ValPos);
+  emitSerialized(Code, Val, Success);
 }
 
 template <typename... Tys>

clang/lib/AST/Interp/ByteCodeExprGen.cpp

@@ -2215,7 +2215,7 @@ bool ByteCodeExprGen<Emitter>::emitConst(const APSInt &Value, PrimType Ty,
                                          const Expr *E) {
   if (Ty == PT_IntAPS)
     return this->emitConstIntAPS(Value, E);
-  else if (Ty == PT_IntAP)
+  if (Ty == PT_IntAP)
     return this->emitConstIntAP(Value, E);
 
   if (Value.isSigned())