diff --git a/tools/llvm-xray/xray-account.cc b/tools/llvm-xray/xray-account.cc
index 0ba6cad5cca..7b684aad693 100644
--- a/tools/llvm-xray/xray-account.cc
+++ b/tools/llvm-xray/xray-account.cc
@@ -418,6 +418,9 @@ template <> struct format_provider<llvm::xray::RecordTypes> {
       case RecordTypes::ENTER:
         Stream << "enter";
         break;
+      case RecordTypes::ENTER_ARG:
+        Stream << "enter-arg";
+        break;
       case RecordTypes::EXIT:
         Stream << "exit";
         break;
diff --git a/tools/llvm-xray/xray-stacks.cc b/tools/llvm-xray/xray-stacks.cc
index 40dcc31cd1f..d727496f4e7 100644
--- a/tools/llvm-xray/xray-stacks.cc
+++ b/tools/llvm-xray/xray-stacks.cc
@@ -321,7 +321,8 @@ public:
                                     AccountRecordState *state) {
     auto &TS = ThreadStackMap[R.TId];
     switch (R.Type) {
-    case RecordTypes::ENTER: {
+    case RecordTypes::ENTER:
+    case RecordTypes::ENTER_ARG: {
       state->wasLastRecordExit = false;
       // When we encounter a new function entry, we want to record the TSC for
       // that entry, and the function id. Before doing so we check the top of