[clang][Interp] Implement basic support for floating point values

[tbaeder]

Summary

This only handles floats for now, so 32 bit floating point values.

There are a few things I'm uncertain about, like how to implement Floating<>::truncate() or whether or not Float32 should be part of AluTypeClass.

[tbaeder]

clang/lib/AST/Interp/Context.cpp

130

clang/lib/AST/Interp/Floating.h

107

The operations here don't do overflow or UB handling.

[shafik]

clang/lib/AST/Interp/Floating.h

81

bool isNaN() const { return V != V; }

[aaron.ballman]

I've not given this a full review yet, but I do have some comments on a partial review. Mostly, I'm concerned we're going to have different semantics when evaluating than we'd get if the evaluation happened at runtime because we're using the host floating-point environment and not the target. I'm also a bit concerned the design won't extend very easily to long double support. We don't have to solve all of this with the initial offering, but I think we want to be sure we're building the float support on a stable base.

Adding @jcranmer-intel for another set of eyes on this code from someone who knows many of the most terrifying parts of floating-point support.

clang/lib/AST/Interp/ByteCodeExprGen.cpp

203

Is there a reason you want to convert to the host float format here instead of passing along the APFloat object so semantics follow the target?

clang/lib/AST/Interp/Floating.h

28–30

Er, how will this extend to long double where the number of bits is rather more difficult?

75–80

Hmm, this is making my spidey senses tingle. For example, negative zero should be negative, but < won't help you with that: https://godbolt.org/z/xonxqPv5r (and it definitely won't help for negative inf or a signed NaN).

[jcranmer-intel]

Some extra constexpr tests that may be interesting:

• Constant expressions that produce floating point exceptions other than FE_INEXACT.
• Subnormal values as operands, as well as operations with normal operands that produce denormal values (i.e., check for DAZ/FTZ, respectively.)
• qNaN arithmetic
• sNaN arithmetic
• different NaN payloads (this can also catch out differences caused by host hardware: there's disagreement as to which NaN payload is used in an fadd, some processors prefer the first one, others prefer the second one).
• converting infinity, NaN, numbers outside INT_MAX range to integers
• converting integers to floating-point outside the latter's range--that's only possible with unsigned __int128 and float or uint32_t and half though

Some of these tests relate to things that you haven't implemented yet--and that's fine--but it's worth keeping in mind for future patches.

clang/lib/AST/Interp/Floating.h

28–30

Or half and bfloat, which are both 16-bit floating-point types?

32–34

My gut reaction is that, for floating-point types, you're probably better off using APFloat directly rather than trying to use the float/double platform types directly. Directly using platform types for computation means you potentially have changes based on the how clang itself was compiled--especially if someone decides to compile clang with -ffast-math and now all your constexpr stuff is executing in FTZ/DAZ mode. APFloat may be slower, but it also provides more protection from floating-point chicanery.

83

This is supposed to be capable of returning unordered if *this or RHS is a NaN, right?

107

They also don't support rounding mode. (constexpr evaluation arguably should at least support FENV_ROUND)

[tbaeder]

clang/lib/AST/Interp/Floating.h

28–30

I have spent some time with this today and tried to simply always use APFloat instead of a primitive type. Unfortunately that doesn't work because what we put on the stack is not the Floating (or Integral), but the underlying primitive type. So even if we do the final math (in ::add, etc) via APFloat, we need something we can serialize to char[] so we can put it on the stack. Do you think that would work?

[jcranmer-intel]

clang/lib/AST/Interp/Floating.h

28–30

I don't know enough about the structure of the bytecode interpreter here to say for sure, but this smells to me like you're baking in an assumption that every primitive target type has a corresponding primitive type on the host. This assumption just doesn't hold when it comes to floating point (only two of the seven types, float and double, are generally portable, and even then, there be dragons in some corner cases).

If you do need to continue down this route, there are two requirements that should be upheld:

• The representation shouldn't assume that the underlying primitive type exists on host (bfloat16 and float128 are better test cases here).
• Conversion to/from host primitive types shouldn't be easy to accidentally do.

(Worth repeating again that bit size is insufficient to distinguish floating point types: bfloat and half are both 16-bit, PPC long double and IEEE 754 quad precision are both 128-bit, and x86 long double is 80 bits stored as 96 bits on 32-bit and 128 bits on 64-bit.)

[tbaeder]

clang/lib/AST/Interp/Floating.h

28–30

Well, is there a way to convert an APFloat to a char[] that would work instead of going to float/double and storing that? The only thing I see in the docs is convertToHexString() (and the docs don't mention whether the conversion is lossy). If not, do you think adding such a conversion to APFloat and its various implementations is the better way forward?

[aaron.ballman]

clang/lib/AST/Interp/Floating.h

28–30

Let's avoid serializing the floats to strings so that we can parse the string to turn it back into a float later; that's going to have poor performance even if we do get all the corner cases correct regarding things like rounding, etc.

APFloat does not have any sort of serialization functionality beyond through strings representing the value. I think you'd have to invent such an interface.

[tbaeder]

clang/lib/AST/Interp/Floating.h

28–30

Do you know who I might talk to regrading such an interface, both the implementation as well as general feasibility?

[aaron.ballman]

clang/lib/AST/Interp/Floating.h

28–30

I think there may be at least two ways to do this: use an APFloat and put the serialization interfaces there, or use an APValue and put the serialization interfaces there.

Because APFloat is an ADT in LLVM, I think it should probably go up on Discourse for broader discussion. @chandlerc is still listed as the code owner for ADTs but he's not been active in quite some time. Instead, I would recommend talking to @dblaikie (he's got a good eye for ADT work in general) and @foad, @RKSimon, and @sepavloff as folks who have recently been touching APFloat.

APValue is a Clang-specific class, and it already has some amount of serialization support, it seems (https://github.com/llvm/llvm-project/blob/main/clang/include/clang/AST/APValue.h#L54). From a quick look, it seems we're already using APValue in a reasonable number of places in the interpreter, so it might make sense to use this object consistently to represent all values in the new interpreter?

[jcranmer-intel]

clang/lib/AST/Interp/Floating.h

28–30

Going through APInt is already possible in APFloat, and that might have some methods to go to char arrays.

[dblaikie]

clang/lib/AST/Interp/Floating.h

28–30

Yeah - IR gets serialized APFloats somehow (maybe through some layers of indirection) so I'd suggest looking at how, say, a global float named constant gets lowered to bitcode to see how that APFloat is serialized.

If that's not enough of a pointer for you/others to find something helpful, I can look further to see what I can find (I got some of the way - a small example with just extern const float v; const float v = 3.14; and breaking on APFloat's ctor immediately finds the APFLoat being constructed from that literal - then I looked at llvm::GlobalVariable's ctor, which does break on the creation of v, but didn't continue further to figure out how the parsed value gets into the IR constant)

[tbaeder]

clang/lib/AST/Interp/Floating.h

28–30

So, I think this is implemented in emitGlobalConstantFP(): https://github.com/llvm/llvm-project/blob/main/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#L3206. I now wonder how to implement this, since the number of chunks isn't fixed. And all this seems rather costly given that we'd have to do this every time we access a floating point value on the stack.

[dblaikie]

clang/lib/AST/Interp/Floating.h

28–30

That looks like the lowering to assembly - I meant the lowering to LLVM IR bitcode, though perhaps it's similarly complicated.

As for variable length - I expect the strings encoding had variable length too, but either relied on null termination or a length prefix. The APFloat serialization could use a length prefix encoding to specify how many bytes to read/decode (I guess LLVM IR bitcode does something like that - though I think the bitcode records always encode their length, so it might be implicit).

[tbaeder]

Another try, this time without any underlying host type.

There are a few things I'm uncertain about. The tests are obviously not enough, especially now that I had to add another CastFP opcode to cast floats between different semantics.

The general approach seems much saner than before, but I'm sure you'll find enough problem with this one as well :)

BTW, I feel like there are a lot of comments on this review now, so if you'd like me to split the new version of the patch out into another ticket, I can do that of course.

[tbaeder]

clang/lib/AST/Interp/Floating.h

34–35

This is currently commented out, but I think I can get the semantics of the APFloat and ask its semantics for min/max values.

[jcranmer-intel]

clang/lib/AST/Interp/Floating.h

34–35

APFloat::get{Largest,Smallest} will do the trick.

90

FYI, operator== on APFloat requires the two types to have the same semantics. Probably the fastest way to check if it's -1 is either ilogb(F) == 0 && F.isNegative() or F.isExactlyValue(-1.0).

clang/lib/AST/Interp/Interp.cpp

421

FWIW, const llvm::fltSemantics & is the usual way it's used.

[tbaeder]

clang/lib/AST/Interp/Interp.cpp

421

I saw, but this is going through a char[] stack a gain and I don't think using a reference works there.

[tbaeder]

clang/lib/AST/Interp/Floating.h

34–35

I only need them for isMin(), so isSmallest() even works, thanks!

[tbaeder]

Any other opinions on the new approach?

[sepavloff]

clang/lib/AST/Interp/Boolean.h

59

Is there any reason why operator double exists, but operator float does not?

clang/lib/AST/Interp/ByteCodeExprGen.cpp

144

Does this two-stage conversion make sense? In contrast to things like PT_Sint8 PT_Float is not a real type, it designates a set (potentially open) of all floating-point types. What is the meaning of this conversion? Why emitCastFP is not enough?

BTW which classes implement emitCast and emitCastFP? Usually such casts depend on rounding mode, how these methods get it?

479

Should this method get floating-point semantic as a parameter?

clang/lib/AST/Interp/Floating.h

38

This constructor creates a value of particular floating-point type, which generally is not compatible with floating-point values of other types. Does it need a semantic argument?

45

This method requires semantic just as getInf.

55–63

Conversions to integers are bitcasts+truncation but the conversion to bool is different. What semantics have these operations?

[tbaeder]

clang/lib/AST/Interp/ByteCodeExprGen.cpp

144

I think we could do this in CastFP, yes. But what happens right now is that we use Floating::from() with, e.g. a int32_t, which just does APFloat(int32_t), which I think results in float semantics. So if we're instead casting from int to double, the CastFP is needed.

CastFP is implemented below in this diff and uses Floating::toSemantics(). Cast is using ToT::from(FromT), so uses Floating::from() to do the cast.

479

Yes I think that would be alright, we could just get the right semantics in this function.

clang/lib/AST/Interp/Floating.h

38

That's a good question. I think generally you're right but I don't know where this constructor is used at all right now. Might just be dead code.

55–63

They are basically used for casting. I didn't mean to make the bool implementation different, just seemed to make sense to me to do it this way.

[sepavloff]

clang/lib/AST/Interp/Floating.h

55–63

If they are used for casting, they need to preserve value, that is conversion float->int32 should transform 1.0->0x00000001. The method toAPSInt uses bitcast, so it converts 1.0->0x3f800000. APFloat::convertToInteger should be used to make value-preverving conversion but it requires knowledge of rounding mode.

[tbaeder]

clang/lib/AST/Interp/Floating.h

55–63

That's good to know, thanks. I've already used TowardZero in Floating::toSemantics(), but that was more a guess.

Is the rounding mode I'm supposed to use simply LangOptions::getDefaultRoundingMode()?

[sepavloff]

clang/lib/AST/Interp/Floating.h

55–63

Rounding mode is stored in AST node, a call to Expr::getFPFeaturesInEffect may be used to extract various FP features in the form of FPOptions. LangOptions::getDefaultRoundingMode() returns the default rounding mode, which may be changed using #pragma STDC FENV_ROUND.

[tbaeder]

Another (and even longer) version.

Introduce special opcodes for floating point operations and pass the rounding mode to them. Also create special int->float and float->int casts so we can handle that properly.

This makes clang/tests/SemaCXX/rouding-math.cpp work. I've only enabled one of the two RUN lines though. The other one fails because we don't handle CXXNewExprs yet.

[tbaeder]

clang/lib/AST/Interp/ByteCodeExprGen.cpp

479

I left the implementation of this out since visitZeroInitializer() is dead code right now anyway and the patch is already large enough.

[tbaeder]

Ping

[sepavloff]

clang/lib/AST/Interp/PrimType.h

39

In contrast to other members of this enumeration, PT_Float does not designate a concrete type, and it must creates problems. For example, how function primSize(PrimType Type) can be implemented?

[tbaeder]

clang/lib/AST/Interp/PrimType.h

39

Yes, floats are a bit special, see also the special case in getCtorPrim() in Descriptor.cpp. But I don't think it's a problem for primSize() since that only uses sizeof().

[sepavloff]

clang/lib/AST/Interp/PrimType.h

39

sizeof in primSize() would return sizeof(clang::interp::Floating), which is sizeof(APFloat). This value is not the same as sizeof(float) or sizeof(double).

[tbaeder]

clang/lib/AST/Interp/PrimType.h

39

I am aware, but primSize() is not used to implement sizeof() or anything like that, it's used on the host side to do memory allocation, e.g. Descriptor uses it to allocate NumElems * primSize(T) bytes for primitive arrays.

[tbaeder]

Moved the tests to their own file and moved the isConstantContext() changes to InterpState to their own NFC commit.

[tbaeder]

Ping

[jcranmer-intel]

clang/lib/AST/Interp/Interp.cpp

426

Not sure I understand the conditions that cause S.inConstantContext() to be true, which gives me some cause for concern. Additionally, there's no tests covering the checks in the function.

clang/lib/AST/Interp/Opcodes.td

488

Integer-to-floating point conversion is dependent on rounding mode--consider (float)UINT_MAX.

[tbaeder]

clang/lib/AST/Interp/Interp.cpp

426

This function is almost copy/paste from checkFloatingPointResult in ExprConstant.cpp: https://github.com/llvm/llvm-project/blob/main/clang/lib/AST/ExprConstant.cpp#L2581

clang/lib/AST/Interp/Opcodes.td

488

This test succeeds here, whether I use -frounding-math or not:

constexpr float f = (float)4294967295;
static_assert(f == (float)4.2949673E+9);

How can I test this behavior?

[sepavloff]

clang/lib/AST/Interp/Opcodes.td

488

You can use #pragma STDC FENV_ROUND. See clang/test/AST/const-fpfeatures.c as an example.

[tbaeder]

Added a const-fpfeatures.cpp test and added semantics converstion to ::add as an example.

[tbaeder]

clang/lib/AST/Interp/Opcodes.td

488

Why does it work here to compare both f and f2 to the same value? https://godbolt.org/z/zdsf1sK7r

[tbaeder]

Return opStatus from convertToInteger as well, and add a test case to floats.cpp that tests float-to-integer conversion.

[tbaeder]

Report overflows when converting floats to integers.

[jcranmer-intel]

clang/lib/AST/Interp/Opcodes.td

488

FENV_ROUND is a new feature of C2x, so it doesn't look like it's properly handled in gcc or clang yet. (It's for sure not handled in clang--the code to convert a floating-point literal into an APFloat hardcodes default rounding mode in its call.)

Dynamic rounding mode shows you the difference: https://godbolt.org/z/856xM8KTh

[tbaeder]

clang/lib/AST/Interp/Opcodes.td

488

So I can't test this at all because it first needs work in clang to do the float->APFloat conversion correctly?

[sepavloff]

Patch https://reviews.llvm.org/D137719 fixed int->float conversion.

[tbaeder]

Added the int-to-float conversion tests from https://reviews.llvm.org/D137719

[tbaeder]

Ping

[tbaeder]

FYI, I noticed the way the floating values are serialized doesn't work if the APFloat heap-allocated anything; those values aren't preserved through (de)serialization of course.

Reproducer:

constexpr double foo() {
  return __LDBL_MIN__;
}

[sepavloff]

In D134859#3943926, @tbaeder wrote:

FYI, I noticed the way the floating values are serialized doesn't work if the APFloat heap-allocated anything; those values aren't preserved through (de)serialization of course.

Reproducer:

constexpr double foo() {
  return __LDBL_MIN__;
}

The return statement returns a value of type long double while the function returns double. If long double is wider than double, truncation occurs, may be this is the reason?

[tbaeder]

In D134859#3945709, @sepavloff wrote:

In D134859#3943926, @tbaeder wrote:

FYI, I noticed the way the floating values are serialized doesn't work if the APFloat heap-allocated anything; those values aren't preserved through (de)serialization of course.

Reproducer:

constexpr double foo() {
  return __LDBL_MIN__;
}

The return statement returns a value of type long double while the function returns double. If long double is wider than double, truncation occurs, may be this is the reason?

It also happens when the function returns a long double.

I tracked the problem down to the way we emit byte code into a std::vector. It's simply reintepret_cast'ed to const char *, so that won't work for APFloat.

This change seems to fix the problem:

diff --git a/clang/lib/AST/Interp/ByteCodeEmitter.cpp b/clang/lib/AST/Interp/ByteCodeEmitter.cpp
index ff2136d34872..61e9662013c3 100644
--- a/clang/lib/AST/Interp/ByteCodeEmitter.cpp
+++ b/clang/lib/AST/Interp/ByteCodeEmitter.cpp
@@ -163,8 +163,15 @@ static void emit(Program &P, std::vector<char> &Code, const T &Val,
   }

   if constexpr (!std::is_pointer_v<T>) {
-    const char *Data = reinterpret_cast<const char *>(&Val);
-    Code.insert(Code.end(), Data, Data + Size);
+     if constexpr (std::is_trivially_copyable_v<T>) {
+      const char *Data = reinterpret_cast<const char *>(&Val);
+      Code.insert(Code.end(), Data, Data + Size);
+     } else {
+       // Construct the value directly into our storage vector.
+       size_t ValPos = Code.size();
+       Code.resize(Code.size() + Size);
+       new (Code.data() + ValPos) T(Val);
+     }
   } else {
     uint32_t ID = P.getOrCreateNativePointer(Val);
     const char *Data = reinterpret_cast<const char *>(&ID);

[tbaeder]

Remove some questionable (but unused) Floating API that didn't take floating-point semantics into account.

[sepavloff]

clang/lib/AST/Interp/ByteCodeExprGen.cpp

149

According to C standard (6.3.1.4p1):

When a finite value of real floating type is converted to an integer type other than _Bool, the fractional part is discarded (i.e., the value is truncated toward zero).

So the conversion should not depend on rounding mode. The same applies to the conversion to boolean (6.3.1.2p1):

When any scalar value is converted to _Bool, the result is 0 if the value compares equal to 0; otherwise, the result is 1.

434–435

This and some subsequent operations also should depend on rounding mode?

clang/lib/AST/Interp/Floating.h

110

Do we really need this check? In AST operands of addition always have the same type.

clang/lib/AST/Interp/Interp.cpp

422–423

This comment is not exact. In a context context rounding mode may be affected by #pragma STDC FENV_ROUND.

clang/lib/AST/Interp/Interp.h

1013

Integral::canRepresent is suitable only for integral-to-intergal conversions. With loss of precision the floating-point numbers can represent wider range of integers.

[tbaeder]

clang/lib/AST/Interp/ByteCodeExprGen.cpp

149

So this is a difference between C and C++?

434–435

Yes, I did add as an example, the others will have to follow.

clang/lib/AST/Interp/Floating.h

110

In https://godbolt.org/z/s4n75jc4h, the LHS of the CompoundAssignOperator is float while the RHS is double

[sepavloff]

clang/lib/AST/Interp/ByteCodeExprGen.cpp

149

No, C++ behaves similarly ([conv.fpint]):

A prvalue of a floating-point type can be converted to a prvalue of an integer type. The conversion truncates;
that is, the fractional part is discarded.

and [conv.bool]:

A prvalue of arithmetic, unscoped enumeration, pointer, or pointer-to-member type can be converted to a
prvalue of type bool. A zero value, null pointer value, or null member pointer value is converted to false;
any other value is converted to true.

Theses conversions do not depend on rounding mode.

[tbaeder]

clang/lib/AST/Interp/ByteCodeExprGen.cpp

149

Ah ok, thanks for the explanation. That explains why the current interpeter hardcodes rmTowardZero there. The rounding mode in Floating::convertToInteger was unused for that reason.

[tbaeder]

Ping

[sepavloff]

clang/lib/AST/Interp/Floating.h

110

The case of CompoundAssignOperator cannot be implemented using the same function as for BinaryOperator. The operation float += double implies three operations:

1. float value is converted to double,
2. addition of double values is made,
3. double result is converted to float.

The conversions 1 and 3 are not represented by ImplicitCasts, as demonstrated by your code snippet.

[tbaeder]

Remove conversion in Floating::add() and tests that relied on it. Compound assignment operators can be properly implemented later.

[sepavloff]

clang/lib/AST/Interp/ByteCodeExprGen.cpp

435

As discussed previously, compound assign operator cannot be implemented with the same function as corresponding binary operator in general case.

clang/lib/AST/Interp/Interp.h

1008

Conversion to boolean can be made with APFloat::isNonZero. It would correctly handle all values including NaNs/Infs. convertToInteger may leave Result unchanged if Status is invalid.

1013

I was wrong, this is float-to-integer conversion. Would it be easier to detect overflow (as well as other cases, like NaN) by checking that Status==opInvalidOp && F.isFinite()?

[tbaeder]

clang/lib/AST/Interp/ByteCodeExprGen.cpp

435

I left this in so at least one of the test cases in const-fpfeatures.cpp would work. But it seems like using res = res + y instead works as well and breaks if the #pragma before is commented-out, so I can use that instead.

clang/lib/AST/Interp/Interp.h

1013

That seems to work, yes. I switched to that and added an overflow test case to`floats.cpp`.

[sepavloff]

LGTM.

clang/lib/AST/CMakeLists.txt

add_clang_library(clangAST
   Interp/ByteCodeGenError.cpp
   Interp/ByteCodeStmtGen.cpp
   Interp/Context.cpp
   Interp/Descriptor.cpp
   Interp/Disasm.cpp
   Interp/EvalEmitter.cpp
   Interp/Frame.cpp
   Interp/Function.cpp
+  Interp/Floating.cpp
   Interp/Interp.cpp
   Interp/InterpBuiltin.cpp
   Interp/InterpBlock.cpp
   Interp/InterpFrame.cpp
   Interp/InterpStack.cpp
   Interp/InterpState.cpp
   Interp/Pointer.cpp
   Interp/PrimType.cpp

clang/lib/AST/Interp/Boolean.h

public:
   explicit operator uint8_t() const { return V; }
   explicit operator int16_t() const { return V; }
   explicit operator uint16_t() const { return V; }
   explicit operator int32_t() const { return V; }
   explicit operator uint32_t() const { return V; }
   explicit operator int64_t() const { return V; }
   explicit operator uint64_t() const { return V; }
   explicit operator bool() const { return V; }
+  explicit operator double() const { return V; }
 
   APSInt toAPSInt() const {
     return APSInt(APInt(1, static_cast<uint64_t>(V), false), true);
   }
   APSInt toAPSInt(unsigned NumBits) const {
     return APSInt(toAPSInt().zextOrTrunc(NumBits), true);
   }
   APValue toAPValue() const { return APValue(toAPSInt()); }

clang/lib/AST/Interp/ByteCodeExprGen.h

public:
   /// Initializes the compiler and the backend emitter.
   template <typename... Tys>
   ByteCodeExprGen(Context &Ctx, Program &P, Tys &&... Args)
       : Emitter(Ctx, P, Args...), Ctx(Ctx), P(P) {}
 
   // Expression visitors - result returned on interp stack.
   bool VisitCastExpr(const CastExpr *E);
   bool VisitIntegerLiteral(const IntegerLiteral *E);
+  bool VisitFloatingLiteral(const FloatingLiteral *E);
   bool VisitParenExpr(const ParenExpr *E);
   bool VisitBinaryOperator(const BinaryOperator *E);
   bool VisitCXXDefaultArgExpr(const CXXDefaultArgExpr *E);
   bool VisitCallExpr(const CallExpr *E);
   bool VisitCXXMemberCallExpr(const CXXMemberCallExpr *E);
   bool VisitCXXDefaultInitExpr(const CXXDefaultInitExpr *E);
   bool VisitCXXBoolLiteralExpr(const CXXBoolLiteralExpr *E);
   bool VisitCXXNullPtrLiteralExpr(const CXXNullPtrLiteralExpr *E);

clang/lib/AST/Interp/ByteCodeExprGen.cpp

case CK_UncheckedDerivedToBase: {
     assert(ToDecl);
     const Record *R = getRecord(FromDecl);
     const Record::Base *ToBase = R->getBase(ToDecl);
     assert(ToBase);
 
     return this->emitGetPtrBase(ToBase->Offset, CE);
   }
 
+  case CK_FloatingCast: {
+    if (!this->visit(SubExpr))
+      return false;
+
+    const auto *TargetSemantics =
+        &Ctx.getASTContext().getFloatTypeSemantics(CE->getType());
+    return this->emitCastFP(TargetSemantics, CE);
+  }
+
+  case CK_IntegralToFloating: {
+    // First cast the integral to a Floating, THEN cast the
+    // Floating to Floating with the same semantics.
+    Optional<PrimType> FromT = classify(SubExpr->getType());
+    if (!FromT)
+      return false;
+
+    if (!this->visit(SubExpr))
+      return false;
+
+    if (!this->emitCast(*FromT, PT_Float, CE))
+      return false;
+
+    const auto *TargetSemantics =
+        &Ctx.getASTContext().getFloatTypeSemantics(CE->getType());
+    return this->emitCastFP(TargetSemantics, CE);
+  }
+
   case CK_ArrayToPointerDecay:
   case CK_AtomicToNonAtomic:
   case CK_ConstructorConversion:
   case CK_FunctionToPointerDecay:
   case CK_NonAtomicToAtomic:
   case CK_NoOp:
   case CK_UserDefinedConversion:
   case CK_NullToPointer:
     return this->Visit(SubExpr);
 
   case CK_IntegralToBoolean:
+  case CK_FloatingToIntegral:
   case CK_IntegralCast: {
     Optional<PrimType> FromT = classify(SubExpr->getType());
     Optional<PrimType> ToT = classify(CE->getType());
     if (!FromT || !ToT)
       return false;
 
     if (!this->Visit(SubExpr))
       return false;
bool ByteCodeExprGen<Emitter>::VisitIntegerLiteral(const IntegerLiteral *LE) {
   auto Val = LE->getValue();
   QualType LitTy = LE->getType();
   if (Optional<PrimType> T = classify(LitTy))
     return emitConst(*T, getIntWidth(LitTy), LE->getValue(), LE);
   return this->bail(LE);
 }
 
 template <class Emitter>
+bool ByteCodeExprGen<Emitter>::VisitFloatingLiteral(const FloatingLiteral *E) {
+  if (DiscardResult)
+    return true;
+
+  return this->emitConstFloat(E->getValue(), E);
+}
+
+template <class Emitter>
 bool ByteCodeExprGen<Emitter>::VisitParenExpr(const ParenExpr *PE) {
   return this->Visit(PE->getSubExpr());
 }
 
 template <class Emitter>
 bool ByteCodeExprGen<Emitter>::VisitBinaryOperator(const BinaryOperator *BO) {
   const Expr *LHS = BO->getLHS();
   const Expr *RHS = BO->getRHS();
bool ByteCodeExprGen<Emitter>::VisitAbstractConditionalOperator(
   if (!this->visit(FalseExpr))
     return false;
 
   this->fallthrough(LabelEnd);
   this->emitLabel(LabelEnd);
 
   return true;
 }
 
 template <class Emitter> bool ByteCodeExprGen<Emitter>::discard(const Expr *E) {
   OptionScope<Emitter> Scope(this, /*NewDiscardResult=*/true);
   return this->Visit(E);
 }
 
 template <class Emitter>
 bool ByteCodeExprGen<Emitter>::visit(const Expr *E) {
   OptionScope<Emitter> Scope(this, /*NewDiscardResult=*/false);
   return this->Visit(E);
bool ByteCodeExprGen<Emitter>::visitZeroInitializer(PrimType T, const Expr *E) {
   case PT_Uint32:
     return this->emitZeroUint32(E);
   case PT_Sint64:
     return this->emitZeroSint64(E);
   case PT_Uint64:
     return this->emitZeroUint64(E);
   case PT_Ptr:
     return this->emitNullPtr(E);
+  case PT_Float:
+    return this->emitZeroFloat(E);
   }
   llvm_unreachable("unknown primitive type");
 }
 
 template <class Emitter>
 bool ByteCodeExprGen<Emitter>::dereference(
     const Expr *LV, DerefKind AK, llvm::function_ref<bool(PrimType)> Direct,
     llvm::function_ref<bool(PrimType)> Indirect) {
case PT_Uint32:
     return this->emitConstUint32(Value.getZExtValue(), E);
   case PT_Sint64:
     return this->emitConstSint64(Value.getSExtValue(), E);
   case PT_Uint64:
     return this->emitConstUint64(Value.getZExtValue(), E);
   case PT_Bool:
     return this->emitConstBool(Value.getBoolValue(), E);
   case PT_Ptr:
+  case PT_Float:
     llvm_unreachable("Invalid integral type");
     break;
   }
   llvm_unreachable("unknown primitive type");
 }
 
 template <class Emitter>
 unsigned ByteCodeExprGen<Emitter>::allocateLocalPrimitive(DeclTy &&Src,

clang/lib/AST/Interp/Context.cpp

if (T->isUnsignedIntegerOrEnumerationType()) {
     default:
       return {};
     }
   }
 
   if (T->isNullPtrType())
     return PT_Ptr;
 
+  if (T->isFloatingType())
+    return PT_Float;
+
   if (auto *AT = dyn_cast<AtomicType>(T))
     return classify(AT->getValueType());
 
   return {};
 }
 
 unsigned Context::getCharBit() const {
   return Ctx.getTargetInfo().getCharWidth();

clang/lib/AST/Interp/Descriptor.cpp

for (const auto &F : D->ElemRecord->fields()) {
 
     *(reinterpret_cast<Descriptor **>(Dst + FieldOff) - 1) = FieldDesc;
     if (auto Fn = FieldDesc->MoveFn)
       Fn(B, Src + FieldOff, Dst + FieldOff, FieldDesc);
   }
 }
 
 static BlockCtorFn getCtorPrim(PrimType Type) {
+  // Floating types are special. They are primitives, but need their
+  // constructor called.
+  if (Type == PT_Float)
+    return ctorTy<PrimConv<PT_Float>::T>;
+
   COMPOSITE_TYPE_SWITCH(Type, return ctorTy<T>, return nullptr);
 }
 
 static BlockDtorFn getDtorPrim(PrimType Type) {
   COMPOSITE_TYPE_SWITCH(Type, return dtorTy<T>, return nullptr);
 }
 
 static BlockMoveFn getMovePrim(PrimType Type) {

clang/lib/AST/Interp/Floating.h

+//===--- Floating.h - Types for the constexpr VM ----------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Defines the VM types and helpers operating on types.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CLANG_AST_INTERP_FLOATING_H
+#define LLVM_CLANG_AST_INTERP_FLOATING_H
+
+#include "Primitives.h"
+#include "clang/AST/APValue.h"
+#include "llvm/ADT/APFloat.h"
+#include <limits>
+
+namespace clang {
+namespace interp {
+
+using APFloat = llvm::APFloat;
+using APSInt = llvm::APSInt;
+
+class Floating final {
+private:
+  // The underlying value storage.
+  APFloat F;
+
+  /// Construct a Floating from anything that is convertible to storage.
+  template <typename T> explicit Floating(T V) : F(V) {}
+
+public:
+  /// Zero-initializes a Floating.
+  Floating() : F(0.0f) {}
+  Floating(APFloat F) : F(F) {}
+
+  // Static constructors for special floating point values.
+  static Floating getInf(const llvm::fltSemantics &Sem) {
+    return Floating(APFloat::getInf(Sem));
+  }
+  static Floating zero() { return Floating(0.0f); }
+
+  bool operator<(Floating RHS) const { return F < RHS.F; }
+  bool operator>(Floating RHS) const { return F > RHS.F; }
+  bool operator<=(Floating RHS) const { return F <= RHS.F; }
+  bool operator>=(Floating RHS) const { return F >= RHS.F; }
+  bool operator==(Floating RHS) const { return F == RHS.F; }
+  bool operator!=(Floating RHS) const { return F != RHS.F; }
+  Floating operator-() const { return Floating(-F); }
+
+  explicit operator int8_t() const { return toAPSInt().getExtValue(); }
+  explicit operator uint8_t() const { return toAPSInt().getExtValue(); }
+  explicit operator int16_t() const { return toAPSInt().getExtValue(); }
+  explicit operator uint16_t() const { return toAPSInt().getExtValue(); }
+  explicit operator int32_t() const { return toAPSInt().getExtValue(); }
+  explicit operator uint32_t() const { return toAPSInt().getExtValue(); }
+  explicit operator int64_t() const { return toAPSInt().getExtValue(); }
+  explicit operator uint64_t() const { return toAPSInt().getExtValue(); }
+  explicit operator bool() const { return F.isNonZero(); }
+
+  Floating toSemantics(const llvm::fltSemantics *Sem) const {
+    APFloat Copy = F;
+    bool LosesInfo;
+    Copy.convert(*Sem, llvm::RoundingMode::TowardZero, &LosesInfo);
+    (void)LosesInfo;
+    return Floating(Copy);
+  }
+  APFloat toAPFloat() const { return F; }
+  APSInt toAPSInt(unsigned NumBits = 0) const {
+    return APSInt(F.bitcastToAPInt());
+  }
+  APValue toAPValue() const { return APValue(toAPFloat()); }
+  void print(llvm::raw_ostream &OS) const { F.print(OS); }
+
+  unsigned bitWidth() const { return F.semanticsSizeInBits(F.getSemantics()); }
+
+  bool isSigned() const { return true; }
+  bool isNegative() const { return F.isNegative(); }
+  bool isPositive() const { return !F.isNegative(); }
+  bool isZero() const { return F.isZero(); }
+  bool isMin() const { return F.isSmallest(); }
+  bool isMinusOne() const { return F.isExactlyValue(-1.0); }
+  bool isNan() const { return F.isNaN(); }
+
+  ComparisonCategoryResult compare(const Floating &RHS) const {
+    return Compare(F, RHS.F);
+  }
+
+  // TODO: Properly implement this(?)
+  Floating truncate(unsigned TruncBits) const { return Floating(this->F); }
+
+  template <typename ValT> static Floating from(ValT Value) {
+    if constexpr (std::is_integral<ValT>::value ||
+                  std::is_floating_point<ValT>::value)
+      return Floating(Value);
+    else if constexpr (std::is_same_v<ValT, Floating>) {
+      return Floating(Value.F);
+    } else
+      return Floating::from(static_cast<double>(Value));
+  }
+
+  template <typename T> static Floating from(T Value, unsigned NumBits) {
+    return Floating(Value);
+  }
+
+  // -------
+
+  static bool add(Floating A, Floating B, unsigned OpBits, Floating *R) {
+    *R = Floating(A.F + B.F);
+    return false;
+  }
+
+  static bool sub(Floating A, Floating B, unsigned OpBits, Floating *R) {
+    *R = Floating(A.F - B.F);
+    return false;
+  }
+
+  static bool neg(Floating A, Floating *R) {
+    *R = -A;
+    return false;
+  }
+
+  static bool div(Floating A, Floating B, unsigned OpBits, Floating *R) {
+    *R = Floating(A.F / B.F);
+    return false;
+  }
+
+  static bool mul(Floating A, Floating B, unsigned OpBits, Floating *R) {
+    *R = Floating(A.F * B.F);
+    return false;
+  }
+};
+
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, Floating F);
+Floating getSwappedBytes(Floating F);
+
+} // namespace interp
+} // namespace clang
+
+#endif

clang/lib/AST/Interp/Floating.cpp

+//===---- Floating.cpp - Support for floating point values ------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "Floating.h"
+
+namespace clang {
+namespace interp {
+
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, Floating F) {
+  F.print(OS);
+  return OS;
+}
+
+Floating getSwappedBytes(Floating F) { return F; }
+
+} // namespace interp
+} // namespace clang

clang/lib/AST/Interp/Integral.h

 #include "clang/AST/ComparisonCategories.h"
 #include "clang/AST/APValue.h"
 #include "llvm/ADT/APSInt.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cstddef>
 #include <cstdint>
 
+#include "Primitives.h"
+
 namespace clang {
 namespace interp {
 
 using APInt = llvm::APInt;
 using APSInt = llvm::APSInt;
 
-/// Helper to compare two comparable types.
-template <typename T>
-ComparisonCategoryResult Compare(const T &X, const T &Y) {
-  if (X < Y)
-    return ComparisonCategoryResult::Less;
-  if (X > Y)
-    return ComparisonCategoryResult::Greater;
-  return ComparisonCategoryResult::Equal;
-}
-
+/// Wrapper around numeric types.
+///
+/// These wrappers are required to shared an interface between APSint and
+/// builtin primitive numeral types, while optimising for storage and
+/// allowing methods operating on primitive type to compile to fast code.
+template <unsigned Bits, bool Signed> class Integral final {
+private:
+  template <unsigned OtherBits, bool OtherSigned> friend class Integral;
   // Helper structure to select the representation.
-template <unsigned Bits, bool Signed> struct Repr;
+  template <unsigned ReprBits, bool ReprSigned> struct Repr;
   template <> struct Repr<8, false> { using Type = uint8_t; };
   template <> struct Repr<16, false> { using Type = uint16_t; };
   template <> struct Repr<32, false> { using Type = uint32_t; };
   template <> struct Repr<64, false> { using Type = uint64_t; };
   template <> struct Repr<8, true> { using Type = int8_t; };
   template <> struct Repr<16, true> { using Type = int16_t; };
   template <> struct Repr<32, true> { using Type = int32_t; };
   template <> struct Repr<64, true> { using Type = int64_t; };
 
-/// Wrapper around numeric types.
-///
-/// These wrappers are required to shared an interface between APSint and
-/// builtin primitive numeral types, while optimising for storage and
-/// allowing methods operating on primitive type to compile to fast code.
-template <unsigned Bits, bool Signed> class Integral final {
-private:
-  template <unsigned OtherBits, bool OtherSigned> friend class Integral;
-
   // The primitive representing the integral.
   using ReprT = typename Repr<Bits, Signed>::Type;
   ReprT V;
 
   /// Primitive representing limits.
   static const auto Min = std::numeric_limits<ReprT>::min();
   static const auto Max = std::numeric_limits<ReprT>::max();
 
public:
   template <unsigned DstBits, bool DstSign>
   explicit operator Integral<DstBits, DstSign>() const {
     return Integral<DstBits, DstSign>(V);
   }
 
   explicit operator unsigned() const { return V; }
   explicit operator int64_t() const { return V; }
   explicit operator uint64_t() const { return V; }
+  explicit operator double() const { return V; }
 
   APSInt toAPSInt() const {
     return APSInt(APInt(Bits, static_cast<uint64_t>(V), Signed), !Signed);
   }
   APSInt toAPSInt(unsigned NumBits) const {
     if constexpr (Signed)
       return APSInt(toAPSInt().sextOrTrunc(NumBits), !Signed);
     else

clang/lib/AST/Interp/Interp.h

 
 template <PrimType TIn, PrimType TOut> bool Cast(InterpState &S, CodePtr OpPC) {
   using T = typename PrimConv<TIn>::T;
   using U = typename PrimConv<TOut>::T;
   S.Stk.push<U>(U::from(S.Stk.pop<T>()));
   return true;
 }
 
+/// 1) Pops a Floating from the stack.
+/// 2) Pushes a new floating on the stack that uses the given semantics.
+/// Not templated, so implemented in Interp.cpp.
+bool CastFP(InterpState &S, CodePtr OpPC, const llvm::fltSemantics *Sem);
+
 //===----------------------------------------------------------------------===//
 // Zero, Nullptr
 //===----------------------------------------------------------------------===//
 
 template <PrimType Name, class T = typename PrimConv<Name>::T>
 bool Zero(InterpState &S, CodePtr OpPC) {
   S.Stk.push<T>(T::zero());
   return true;
 }
 
 template <PrimType Name, class T = typename PrimConv<Name>::T>
 inline bool Null(InterpState &S, CodePtr OpPC) {
   S.Stk.push<T>();
   return true;
 }
 
 //===----------------------------------------------------------------------===//
 // This, ImplicitThis
 //===----------------------------------------------------------------------===//
 
 inline bool This(InterpState &S, CodePtr OpPC) {
   // Cannot read 'this' in this mode.
   if (S.checkingPotentialConstantExpression()) {
     return false;
   }
 
   const Pointer &This = S.Current->getThis();
   if (!CheckThis(S, OpPC, This))
     return false;
 
   S.Stk.push<Pointer>(This);
   return true;
 }
 
 //===----------------------------------------------------------------------===//

clang/lib/AST/Interp/Interp.cpp

bool CheckPure(InterpState &S, CodePtr OpPC, const CXXMethodDecl *MD) {
   if (!MD->isPure())
     return true;
   const SourceInfo &E = S.Current->getSource(OpPC);
   S.FFDiag(E, diag::note_constexpr_pure_virtual_call, 1) << MD;
   S.Note(MD->getLocation(), diag::note_declared_at);
   return false;
 }
 
+bool CastFP(InterpState &S, CodePtr OpPC, const llvm::fltSemantics *Sem) {
+  Floating F = S.Stk.pop<Floating>();
+  Floating Result = Floating(F.toSemantics(Sem));
+  S.Stk.push<Floating>(Result);
+  return true;
+}
+
 bool Interpret(InterpState &S, APValue &Result) {
   // The current stack frame when we started Interpret().
   // This is being used by the ops to determine wheter
   // to return from this function and thus terminate
   // interpretation.
   const InterpFrame *StartFrame = S.Current;
   assert(!S.Current->isRoot());
   CodePtr PC = S.Current->getPC();

clang/lib/AST/Interp/InterpStack.h

else if constexpr (std::is_same_v<T, uint32_t> ||
                        std::is_same_v<T, Integral<32, false>>)
       return PT_Uint32;
     else if constexpr (std::is_same_v<T, int64_t> ||
                        std::is_same_v<T, Integral<64, true>>)
       return PT_Sint64;
     else if constexpr (std::is_same_v<T, uint64_t> ||
                        std::is_same_v<T, Integral<64, false>>)
       return PT_Uint64;
+    else if constexpr (std::is_same_v<T, Floating>)
+      return PT_Float;
 
     llvm_unreachable("unknown type push()'ed into InterpStack");
   }
 #endif
 };
 
 } // namespace interp
 } // namespace clang
 
 #endif

clang/lib/AST/Interp/Opcodes.td

 def Sint8 : Type;
 def Uint8 : Type;
 def Sint16 : Type;
 def Uint16 : Type;
 def Sint32 : Type;
 def Uint32 : Type;
 def Sint64 : Type;
 def Uint64 : Type;
+def Float : Type;
 def Ptr : Type;
 
 //===----------------------------------------------------------------------===//
 // Types transferred to the interpreter.
 //===----------------------------------------------------------------------===//
 
 class ArgType { string Name = ?; }
 def ArgSint8 : ArgType { let Name = "int8_t"; }
 def ArgUint8 : ArgType { let Name = "uint8_t"; }
 def ArgSint16 : ArgType { let Name = "int16_t"; }
 def ArgUint16 : ArgType { let Name = "uint16_t"; }
 def ArgSint32 : ArgType { let Name = "int32_t"; }
 def ArgUint32 : ArgType { let Name = "uint32_t"; }
 def ArgSint64 : ArgType { let Name = "int64_t"; }
 def ArgUint64 : ArgType { let Name = "uint64_t"; }
+def ArgFloat : ArgType { let Name = "Floating"; }
 def ArgBool : ArgType { let Name = "bool"; }
 
 def ArgFunction : ArgType { let Name = "const Function *"; }
 def ArgRecordDecl : ArgType { let Name = "const RecordDecl *"; }
 def ArgRecordField : ArgType { let Name = "const Record::Field *"; }
+def ArgFltSemantics : ArgType { let Name = "const llvm::fltSemantics *"; }
 
 //===----------------------------------------------------------------------===//
 // Classes of types instructions operate on.
 //===----------------------------------------------------------------------===//
 
 class TypeClass {
   list<Type> Types;
 }
 
-def NumberTypeClass : TypeClass {
+def IntegerTypeClass : TypeClass {
   let Types = [Sint8, Uint8, Sint16, Uint16, Sint32,
                Uint32, Sint64, Uint64];
 }
 
+def FloatTypeClass : TypeClass {
+  let Types = [Float];
+}
+
+def NumberTypeClass : TypeClass {
+  let Types = !listconcat(IntegerTypeClass.Types, [Float]);
+}
+
 def AluTypeClass : TypeClass {
   let Types = !listconcat(NumberTypeClass.Types, [Bool]);
 }
 
 def PtrTypeClass : TypeClass {
   let Types = [Ptr];
 }
 

 def ConstSint8 : ConstOpcode<Sint8, ArgSint8>;
 def ConstUint8 : ConstOpcode<Uint8, ArgUint8>;
 def ConstSint16 : ConstOpcode<Sint16, ArgSint16>;
 def ConstUint16 : ConstOpcode<Uint16, ArgUint16>;
 def ConstSint32 : ConstOpcode<Sint32, ArgSint32>;
 def ConstUint32 : ConstOpcode<Uint32, ArgUint32>;
 def ConstSint64 : ConstOpcode<Sint64, ArgSint64>;
 def ConstUint64 : ConstOpcode<Uint64, ArgUint64>;
+def ConstFloat : ConstOpcode<Float, ArgFloat>;
 def ConstBool : ConstOpcode<Bool, ArgBool>;
 
 // [] -> [Integer]
 def Zero : Opcode {
   let Types = [AluTypeClass];
   let HasGroup = 1;
 }
 
def InitElemPop : Opcode {
   let HasGroup = 1;
 }
 
 //===----------------------------------------------------------------------===//
 // Pointer arithmetic.
 //===----------------------------------------------------------------------===//
 
 // [Pointer, Integral] -> [Pointer]
-def AddOffset : AluOpcode;
+def AddOffset : Opcode {
+  let Types = [IntegerTypeClass];
+  let HasGroup = 1;
+}
 // [Pointer, Integral] -> [Pointer]
-def SubOffset : AluOpcode;
+def SubOffset : Opcode {
+  let Types = [IntegerTypeClass];
+  let HasGroup = 1;
+}
 
 //===----------------------------------------------------------------------===//
 // Binary operators.
 //===----------------------------------------------------------------------===//
 
 // [Real, Real] -> [Real]
 def Sub : AluOpcode;
 def Add : AluOpcode;
 def Mul : AluOpcode;
 def Rem : Opcode {
-  let Types = [NumberTypeClass];
+  let Types = [IntegerTypeClass];
   let HasGroup = 1;
 }
 def BitAnd : IntegerOpcode;
 def Div : Opcode {
   let Types = [NumberTypeClass];
   let HasGroup = 1;
 }
 

 // [Real] -> [Real]
 def Neg: Opcode {
   let Types = [AluTypeClass];
   let HasGroup = 1;
 }
 
 // [Real] -> [Real]
 def Comp: Opcode {
-  let Types = [NumberTypeClass];
+  let Types = [IntegerTypeClass];
   let HasGroup = 1;
 }
 
 //===----------------------------------------------------------------------===//
-// Cast.
+// Cast, CastFP.
 //===----------------------------------------------------------------------===//
 // TODO: Expand this to handle casts between more types.
 
 def FromCastTypeClass : TypeClass {
-  let Types = [Uint8, Sint8, Uint16, Sint16, Uint32, Sint32, Uint64, Sint64, Bool];
+  let Types = [Uint8, Sint8, Uint16, Sint16, Uint32, Sint32, Uint64, Sint64, Float, Bool];
 }
 
 def ToCastTypeClass : TypeClass {
-  let Types = [Uint8, Sint8, Uint16, Sint16, Uint32, Sint32, Uint64, Sint64, Bool];
+  let Types = [Uint8, Sint8, Uint16, Sint16, Uint32, Sint32, Uint64, Sint64, Float, Bool];
 }
 
 def Cast: Opcode {
   let Types = [FromCastTypeClass, ToCastTypeClass];
   let HasGroup = 1;
 }
 
+def CastFP : Opcode {
+  let Types = [];
+  let Args = [ArgFltSemantics];
+}
+
 //===----------------------------------------------------------------------===//
 // Comparison opcodes.
 //===----------------------------------------------------------------------===//
 
 class EqualityOpcode : Opcode {
   let Types = [AllTypeClass];
   let HasGroup = 1;
 }
 
 def EQ : EqualityOpcode;
 def NE : EqualityOpcode;
 

clang/lib/AST/Interp/PrimType.h

 //===--- PrimType.h - Types for the constexpr VM --------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // Defines the VM types and helpers operating on types.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CLANG_AST_INTERP_TYPE_H
 #define LLVM_CLANG_AST_INTERP_TYPE_H
 
+#include "Boolean.h"
+#include "Floating.h"
+#include "Integral.h"
 #include <climits>
 #include <cstddef>
 #include <cstdint>
-#include "Boolean.h"
-#include "Integral.h"
 
 namespace clang {
 namespace interp {
 
 class Pointer;
 
 /// Enumeration of the primitive types of the VM.
 enum PrimType : unsigned {
   PT_Sint8,
   PT_Uint8,
   PT_Sint16,
   PT_Uint16,
   PT_Sint32,
   PT_Uint32,
   PT_Sint64,
   PT_Uint64,
   PT_Bool,
+  PT_Float,
   PT_Ptr,
 };
 
 /// Mapping from primitive types to their representation.
 template <PrimType T> struct PrimConv;
 template <> struct PrimConv<PT_Sint8> { using T = Integral<8, true>; };
 template <> struct PrimConv<PT_Uint8> { using T = Integral<8, false>; };
 template <> struct PrimConv<PT_Sint16> { using T = Integral<16, true>; };
 template <> struct PrimConv<PT_Uint16> { using T = Integral<16, false>; };
 template <> struct PrimConv<PT_Sint32> { using T = Integral<32, true>; };
 template <> struct PrimConv<PT_Uint32> { using T = Integral<32, false>; };
 template <> struct PrimConv<PT_Sint64> { using T = Integral<64, true>; };
 template <> struct PrimConv<PT_Uint64> { using T = Integral<64, false>; };
+template <> struct PrimConv<PT_Float> { using T = Floating; };
 template <> struct PrimConv<PT_Bool> { using T = Boolean; };
 template <> struct PrimConv<PT_Ptr> { using T = Pointer; };
 
 /// Returns the size of a primitive type in bytes.
 size_t primSize(PrimType Type);
 
 /// Aligns a size to the pointer alignment.
 constexpr size_t align(size_t Size) {
   return ((Size + alignof(void *) - 1) / alignof(void *)) * alignof(void *);
 }
 
 inline bool isPrimitiveIntegral(PrimType Type) {
   switch (Type) {
   case PT_Bool:
   case PT_Sint8:
   case PT_Uint8:
   case PT_Sint16:
   case PT_Uint16:
   case PT_Sint32:
   case PT_Uint32:
   case PT_Sint64:
   case PT_Uint64:
+  case PT_Float:
     return true;
   default:
     return false;
   }
 }
 
 } // namespace interp
 } // namespace clang
 
 /// Helper macro to simplify type switches.
 /// The macro implicitly exposes a type T in the scope of the inner block.
 #define TYPE_SWITCH_CASE(Name, B) \
   case Name: { using T = PrimConv<Name>::T; B; break; }
 #define TYPE_SWITCH(Expr, B)                                                   \
   do {                                                                         \
     switch (Expr) {                                                            \
       TYPE_SWITCH_CASE(PT_Sint8, B)                                            \
       TYPE_SWITCH_CASE(PT_Uint8, B)                                            \
       TYPE_SWITCH_CASE(PT_Sint16, B)                                           \
       TYPE_SWITCH_CASE(PT_Uint16, B)                                           \
       TYPE_SWITCH_CASE(PT_Sint32, B)                                           \
       TYPE_SWITCH_CASE(PT_Uint32, B)                                           \
       TYPE_SWITCH_CASE(PT_Sint64, B)                                           \
       TYPE_SWITCH_CASE(PT_Uint64, B)                                           \
+      TYPE_SWITCH_CASE(PT_Float, B)                                            \
       TYPE_SWITCH_CASE(PT_Bool, B)                                             \
       TYPE_SWITCH_CASE(PT_Ptr, B)                                              \
     }                                                                          \
   } while (0)
 #define COMPOSITE_TYPE_SWITCH(Expr, B, D)                                      \
   do {                                                                         \
     switch (Expr) {                                                            \
       TYPE_SWITCH_CASE(PT_Ptr, B)                                              \
       default: { D; break; }                                                   \
     }                                                                          \
   } while (0)
 #endif

clang/lib/AST/Interp/Primitives.h

+//===------ Primitives.h - Types for the constexpr VM -----------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Utilities and helper functions for all primitive types:
+//  - Integral
+//  - Floating
+//  - Boolean
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CLANG_AST_INTERP_PRIMITIVES_H
+#define LLVM_CLANG_AST_INTERP_PRIMITIVES_H
+
+#include "clang/AST/ComparisonCategories.h"
+
+namespace clang {
+namespace interp {
+
+/// Helper to compare two comparable types.
+template <typename T> ComparisonCategoryResult Compare(const T &X, const T &Y) {
+  if (X < Y)
+    return ComparisonCategoryResult::Less;
+  if (X > Y)
+    return ComparisonCategoryResult::Greater;
+  return ComparisonCategoryResult::Equal;
+}
+
+} // namespace interp
+} // namespace clang
+
+#endif

clang/test/AST/Interp/literals.cpp

 
 namespace band {
   static_assert((10 & 1) == 0, "");
   static_assert((10 & 10) == 10, "");
 
   static_assert((1337 & -1) == 1337, "");
   static_assert((0 & gimme(12)) == 0, "");
 };
+
+namespace floats {
+  constexpr int i = 2;
+  constexpr float f = 1.0f;
+  static_assert(f == 1.0f, "");
+
+  constexpr float f2 = 1u * f;
+  static_assert(f2 == 1.0f, "");
+
+  static_assert(1.0f + 3u == 4, "");
+  static_assert(4.0f / 1.0f == 4, "");
+  static_assert(10.0f * false == 0, "");
+
+  constexpr float floats[] = {1.0f, 2.0f, 3.0f, 4.0f};
+
+  constexpr float m = 5.0f / 0.0f; // ref-error {{must be initialized by a constant expression}} \
+                                   // ref-note {{division by zero}} \
+                                   // expected-error {{must be initialized by a constant expression}} \
+                                   // expected-note {{division by zero}}
+
+  static_assert(~2.0f == 3, ""); // ref-error {{invalid argument type 'float' to unary expression}} \
+                                 // expected-error {{invalid argument type 'float' to unary expression}}
+
+  /// Initialized by a double.
+  constexpr float df = 0.0;
+  /// The other way around.
+  constexpr double fd = 0.0f;
+};