@@ -427,21 +427,20 @@ test_addrmap ()
427427
428428 /* Create mutable addrmap. */
429429 auto_obstack temp_obstack ;
430- auto map = std ::make_unique < struct addrmap_mutable > ();
431- SELF_CHECK (map != nullptr );
430+ addrmap_mutable map ;
432431
433432 /* Check initial state. */
434- check_addrmap_find (* map , array , 0 , 19 , nullptr );
433+ check_addrmap_find (map , array , 0 , 19 , nullptr );
435434
436435 /* Insert address range into mutable addrmap. */
437- map -> set_empty (core_addr (& array [10 ]), core_addr (& array [12 ]), val1 );
438- check_addrmap_find (* map , array , 0 , 9 , nullptr );
439- check_addrmap_find (* map , array , 10 , 12 , val1 );
440- check_addrmap_find (* map , array , 13 , 19 , nullptr );
436+ map . set_empty (core_addr (& array [10 ]), core_addr (& array [12 ]), val1 );
437+ check_addrmap_find (map , array , 0 , 9 , nullptr );
438+ check_addrmap_find (map , array , 10 , 12 , val1 );
439+ check_addrmap_find (map , array , 13 , 19 , nullptr );
441440
442441 /* Create corresponding fixed addrmap. */
443442 addrmap_fixed * map2
444- = new (& temp_obstack ) addrmap_fixed (& temp_obstack , map . get () );
443+ = new (& temp_obstack ) addrmap_fixed (& temp_obstack , & map );
445444 SELF_CHECK (map2 != nullptr );
446445 check_addrmap_find (* map2 , array , 0 , 9 , nullptr );
447446 check_addrmap_find (* map2 , array , 10 , 12 , val1 );
@@ -460,7 +459,7 @@ test_addrmap ()
460459 SELF_CHECK (false );
461460 return 0 ;
462461 };
463- SELF_CHECK (map -> foreach (callback ) == 0 );
462+ SELF_CHECK (map . foreach (callback ) == 0 );
464463 SELF_CHECK (map2 -> foreach (callback ) == 0 );
465464
466465 /* Relocate fixed addrmap. */
@@ -470,11 +469,11 @@ test_addrmap ()
470469 check_addrmap_find (* map2 , array , 14 , 19 , nullptr );
471470
472471 /* Insert partially overlapping address range into mutable addrmap. */
473- map -> set_empty (core_addr (& array [11 ]), core_addr (& array [13 ]), val2 );
474- check_addrmap_find (* map , array , 0 , 9 , nullptr );
475- check_addrmap_find (* map , array , 10 , 12 , val1 );
476- check_addrmap_find (* map , array , 13 , 13 , val2 );
477- check_addrmap_find (* map , array , 14 , 19 , nullptr );
472+ map . set_empty (core_addr (& array [11 ]), core_addr (& array [13 ]), val2 );
473+ check_addrmap_find (map , array , 0 , 9 , nullptr );
474+ check_addrmap_find (map , array , 10 , 12 , val1 );
475+ check_addrmap_find (map , array , 13 , 13 , val2 );
476+ check_addrmap_find (map , array , 14 , 19 , nullptr );
478477}
479478
480479} /* namespace selftests */
0 commit comments