1 files changed, 4 insertions, 22 deletions
diff --git a/src/mongo/db/exec/sbe/values/slot.cpp b/src/mongo/db/exec/sbe/values/slot.cpp
index 4109e01c53e..aa51509e551 100644
--- a/src/mongo/db/exec/sbe/values/slot.cpp
+++ b/src/mongo/db/exec/sbe/values/slot.cpp
@@ -183,14 +183,6 @@ static std::pair<TypeTags, Value> deserializeValue(BufReader& buf) {
             std::tie(tag, val) = makeNewBsonDBPointer({nsStart, nsLen}, id);
             break;
         }
-        case TypeTags::bsonCodeWScope: {
-            auto codeLen = buf.read<LittleEndian<uint32_t>>();
-            auto codeStart = reinterpret_cast<const char*>(buf.skip(codeLen));
-            auto scopeLen = buf.peek<LittleEndian<uint32_t>>();
-            auto scope = reinterpret_cast<const char*>(buf.skip(scopeLen));
-            std::tie(tag, val) = makeNewBsonCodeWScope({codeStart, codeLen}, scope);
-            break;
-        }
         default:
             MONGO_UNREACHABLE;
     }
@@ -342,14 +334,6 @@ static void serializeValue(BufBuilder& buf, TypeTags tag, Value val) {
             buf.appendBuf(dbptr.id, sizeof(ObjectIdType));
             break;
         }
-        case TypeTags::bsonCodeWScope: {
-            auto cws = getBsonCodeWScopeView(val);
-            buf.appendNum(static_cast<uint32_t>(cws.code.size()));
-            buf.appendStr(cws.code, false /* includeEndingNull */);
-            auto scopeLen = ConstDataView(cws.scope).read<LittleEndian<uint32_t>>();
-            buf.appendBuf(cws.scope, scopeLen);
-            break;
-        }
         default:
             MONGO_UNREACHABLE;
     }
@@ -431,10 +415,11 @@ int getApproximateSize(TypeTags tag, Value val) {
             result += ConstDataView(ptr).read<LittleEndian<uint32_t>>();
             break;
         }
-        case TypeTags::bsonBinData:
-            result += sizeof(uint32_t) + sizeof(char) +
-                ConstDataView(getRawPointerView(val)).read<LittleEndian<uint32_t>>();
+        case TypeTags::bsonBinData: {
+            auto binData = getRawPointerView(val);
+            result += ConstDataView(binData).read<LittleEndian<uint32_t>>();
             break;
+        }
         case TypeTags::ksValue: {
             auto ks = getKeyStringView(val);
             result += ks->memUsageForSorter();
@@ -453,9 +438,6 @@ int getApproximateSize(TypeTags tag, Value val) {
         case TypeTags::bsonDBPointer:
             result += getBsonDBPointerView(val).byteSize();
             break;
-        case TypeTags::bsonCodeWScope:
-            result += ConstDataView(getRawPointerView(val)).read<LittleEndian<uint32_t>>();
-            break;
         default:
             MONGO_UNREACHABLE;
     }