tools: fix update_clang_options.zig for ArrayHashMap's Separated Key/Value Storage breaking change.

This commit is contained in:
Rejean Loyer 2021-06-06 21:24:49 -04:00 committed by Jakub Konka
parent b0ee911c23
commit c313e3f509

View File

@ -412,16 +412,16 @@ pub fn main() anyerror!void {
{ {
var it = root_map.iterator(); var it = root_map.iterator();
it_map: while (it.next()) |kv| { it_map: while (it.next()) |kv| {
if (kv.key.len == 0) continue; if (kv.key_ptr.len == 0) continue;
if (kv.key.*[0] == '!') continue; if (kv.key_ptr.*[0] == '!') continue;
if (kv.value.* != .Object) continue; if (kv.value_ptr.* != .Object) continue;
if (!kv.value.Object.contains("NumArgs")) continue; if (!kv.value_ptr.Object.contains("NumArgs")) continue;
if (!kv.value.Object.contains("Name")) continue; if (!kv.value_ptr.Object.contains("Name")) continue;
for (blacklisted_options) |blacklisted_key| { for (blacklisted_options) |blacklisted_key| {
if (std.mem.eql(u8, blacklisted_key, kv.key.*)) continue :it_map; if (std.mem.eql(u8, blacklisted_key, kv.key_ptr.*)) continue :it_map;
} }
if (kv.value.Object.get("Name").?.String.len == 0) continue; if (kv.value_ptr.Object.get("Name").?.String.len == 0) continue;
try all_objects.append(&kv.value.Object); try all_objects.append(&kv.value_ptr.Object);
} }
} }
// Some options have multiple matches. As an example, "-Wl,foo" matches both // Some options have multiple matches. As an example, "-Wl,foo" matches both