Skip to content

Commit d6d0109

Browse files
borsbors
committed
Auto merge of #1732 - RalfJung:atomic_op, r=RalfJung
rename atomic_op_min_max -> atomic_op The corresponding enum is called `AtomicOp` so IMO this also makes more sense as the name for the function.
2 parents 2670839 + 9f3dbad commit d6d0109

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

‎src/shims/intrinsics.rs

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -394,226 +394,226 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
394394
AtomicReadOp::Acquire,
395395
)?,
396396

397-
"atomic_or" => this.atomic_op_min_max(
397+
"atomic_or" => this.atomic_op(
398398
args,
399399
dest,
400400
AtomicOp::MirOp(BinOp::BitOr, false),
401401
AtomicRwOp::SeqCst,
402402
)?,
403-
"atomic_or_acq" => this.atomic_op_min_max(
403+
"atomic_or_acq" => this.atomic_op(
404404
args,
405405
dest,
406406
AtomicOp::MirOp(BinOp::BitOr, false),
407407
AtomicRwOp::Acquire,
408408
)?,
409-
"atomic_or_rel" => this.atomic_op_min_max(
409+
"atomic_or_rel" => this.atomic_op(
410410
args,
411411
dest,
412412
AtomicOp::MirOp(BinOp::BitOr, false),
413413
AtomicRwOp::Release,
414414
)?,
415-
"atomic_or_acqrel" => this.atomic_op_min_max(
415+
"atomic_or_acqrel" => this.atomic_op(
416416
args,
417417
dest,
418418
AtomicOp::MirOp(BinOp::BitOr, false),
419419
AtomicRwOp::AcqRel,
420420
)?,
421-
"atomic_or_relaxed" => this.atomic_op_min_max(
421+
"atomic_or_relaxed" => this.atomic_op(
422422
args,
423423
dest,
424424
AtomicOp::MirOp(BinOp::BitOr, false),
425425
AtomicRwOp::Relaxed,
426426
)?,
427-
"atomic_xor" => this.atomic_op_min_max(
427+
"atomic_xor" => this.atomic_op(
428428
args,
429429
dest,
430430
AtomicOp::MirOp(BinOp::BitXor, false),
431431
AtomicRwOp::SeqCst,
432432
)?,
433-
"atomic_xor_acq" => this.atomic_op_min_max(
433+
"atomic_xor_acq" => this.atomic_op(
434434
args,
435435
dest,
436436
AtomicOp::MirOp(BinOp::BitXor, false),
437437
AtomicRwOp::Acquire,
438438
)?,
439-
"atomic_xor_rel" => this.atomic_op_min_max(
439+
"atomic_xor_rel" => this.atomic_op(
440440
args,
441441
dest,
442442
AtomicOp::MirOp(BinOp::BitXor, false),
443443
AtomicRwOp::Release,
444444
)?,
445-
"atomic_xor_acqrel" => this.atomic_op_min_max(
445+
"atomic_xor_acqrel" => this.atomic_op(
446446
args,
447447
dest,
448448
AtomicOp::MirOp(BinOp::BitXor, false),
449449
AtomicRwOp::AcqRel,
450450
)?,
451-
"atomic_xor_relaxed" => this.atomic_op_min_max(
451+
"atomic_xor_relaxed" => this.atomic_op(
452452
args,
453453
dest,
454454
AtomicOp::MirOp(BinOp::BitXor, false),
455455
AtomicRwOp::Relaxed,
456456
)?,
457-
"atomic_and" => this.atomic_op_min_max(
457+
"atomic_and" => this.atomic_op(
458458
args,
459459
dest,
460460
AtomicOp::MirOp(BinOp::BitAnd, false),
461461
AtomicRwOp::SeqCst,
462462
)?,
463-
"atomic_and_acq" => this.atomic_op_min_max(
463+
"atomic_and_acq" => this.atomic_op(
464464
args,
465465
dest,
466466
AtomicOp::MirOp(BinOp::BitAnd, false),
467467
AtomicRwOp::Acquire,
468468
)?,
469-
"atomic_and_rel" => this.atomic_op_min_max(
469+
"atomic_and_rel" => this.atomic_op(
470470
args,
471471
dest,
472472
AtomicOp::MirOp(BinOp::BitAnd, false),
473473
AtomicRwOp::Release,
474474
)?,
475-
"atomic_and_acqrel" => this.atomic_op_min_max(
475+
"atomic_and_acqrel" => this.atomic_op(
476476
args,
477477
dest,
478478
AtomicOp::MirOp(BinOp::BitAnd, false),
479479
AtomicRwOp::AcqRel,
480480
)?,
481-
"atomic_and_relaxed" => this.atomic_op_min_max(
481+
"atomic_and_relaxed" => this.atomic_op(
482482
args,
483483
dest,
484484
AtomicOp::MirOp(BinOp::BitAnd, false),
485485
AtomicRwOp::Relaxed,
486486
)?,
487-
"atomic_nand" => this.atomic_op_min_max(
487+
"atomic_nand" => this.atomic_op(
488488
args,
489489
dest,
490490
AtomicOp::MirOp(BinOp::BitAnd, true),
491491
AtomicRwOp::SeqCst,
492492
)?,
493-
"atomic_nand_acq" => this.atomic_op_min_max(
493+
"atomic_nand_acq" => this.atomic_op(
494494
args,
495495
dest,
496496
AtomicOp::MirOp(BinOp::BitAnd, true),
497497
AtomicRwOp::Acquire,
498498
)?,
499-
"atomic_nand_rel" => this.atomic_op_min_max(
499+
"atomic_nand_rel" => this.atomic_op(
500500
args,
501501
dest,
502502
AtomicOp::MirOp(BinOp::BitAnd, true),
503503
AtomicRwOp::Release,
504504
)?,
505-
"atomic_nand_acqrel" => this.atomic_op_min_max(
505+
"atomic_nand_acqrel" => this.atomic_op(
506506
args,
507507
dest,
508508
AtomicOp::MirOp(BinOp::BitAnd, true),
509509
AtomicRwOp::AcqRel,
510510
)?,
511-
"atomic_nand_relaxed" => this.atomic_op_min_max(
511+
"atomic_nand_relaxed" => this.atomic_op(
512512
args,
513513
dest,
514514
AtomicOp::MirOp(BinOp::BitAnd, true),
515515
AtomicRwOp::Relaxed,
516516
)?,
517-
"atomic_xadd" => this.atomic_op_min_max(
517+
"atomic_xadd" => this.atomic_op(
518518
args,
519519
dest,
520520
AtomicOp::MirOp(BinOp::Add, false),
521521
AtomicRwOp::SeqCst,
522522
)?,
523-
"atomic_xadd_acq" => this.atomic_op_min_max(
523+
"atomic_xadd_acq" => this.atomic_op(
524524
args,
525525
dest,
526526
AtomicOp::MirOp(BinOp::Add, false),
527527
AtomicRwOp::Acquire,
528528
)?,
529-
"atomic_xadd_rel" => this.atomic_op_min_max(
529+
"atomic_xadd_rel" => this.atomic_op(
530530
args,
531531
dest,
532532
AtomicOp::MirOp(BinOp::Add, false),
533533
AtomicRwOp::Release,
534534
)?,
535-
"atomic_xadd_acqrel" => this.atomic_op_min_max(
535+
"atomic_xadd_acqrel" => this.atomic_op(
536536
args,
537537
dest,
538538
AtomicOp::MirOp(BinOp::Add, false),
539539
AtomicRwOp::AcqRel,
540540
)?,
541-
"atomic_xadd_relaxed" => this.atomic_op_min_max(
541+
"atomic_xadd_relaxed" => this.atomic_op(
542542
args,
543543
dest,
544544
AtomicOp::MirOp(BinOp::Add, false),
545545
AtomicRwOp::Relaxed,
546546
)?,
547-
"atomic_xsub" => this.atomic_op_min_max(
547+
"atomic_xsub" => this.atomic_op(
548548
args,
549549
dest,
550550
AtomicOp::MirOp(BinOp::Sub, false),
551551
AtomicRwOp::SeqCst,
552552
)?,
553-
"atomic_xsub_acq" => this.atomic_op_min_max(
553+
"atomic_xsub_acq" => this.atomic_op(
554554
args,
555555
dest,
556556
AtomicOp::MirOp(BinOp::Sub, false),
557557
AtomicRwOp::Acquire,
558558
)?,
559-
"atomic_xsub_rel" => this.atomic_op_min_max(
559+
"atomic_xsub_rel" => this.atomic_op(
560560
args,
561561
dest,
562562
AtomicOp::MirOp(BinOp::Sub, false),
563563
AtomicRwOp::Release,
564564
)?,
565-
"atomic_xsub_acqrel" => this.atomic_op_min_max(
565+
"atomic_xsub_acqrel" => this.atomic_op(
566566
args,
567567
dest,
568568
AtomicOp::MirOp(BinOp::Sub, false),
569569
AtomicRwOp::AcqRel,
570570
)?,
571-
"atomic_xsub_relaxed" => this.atomic_op_min_max(
571+
"atomic_xsub_relaxed" => this.atomic_op(
572572
args,
573573
dest,
574574
AtomicOp::MirOp(BinOp::Sub, false),
575575
AtomicRwOp::Relaxed,
576576
)?,
577577
"atomic_min" =>
578-
this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::SeqCst)?,
578+
this.atomic_op(args, dest, AtomicOp::Min, AtomicRwOp::SeqCst)?,
579579
"atomic_min_acq" =>
580-
this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::Acquire)?,
580+
this.atomic_op(args, dest, AtomicOp::Min, AtomicRwOp::Acquire)?,
581581
"atomic_min_rel" =>
582-
this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::Release)?,
582+
this.atomic_op(args, dest, AtomicOp::Min, AtomicRwOp::Release)?,
583583
"atomic_min_acqrel" =>
584-
this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::AcqRel)?,
584+
this.atomic_op(args, dest, AtomicOp::Min, AtomicRwOp::AcqRel)?,
585585
"atomic_min_relaxed" =>
586-
this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::Relaxed)?,
586+
this.atomic_op(args, dest, AtomicOp::Min, AtomicRwOp::Relaxed)?,
587587
"atomic_max" =>
588-
this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::SeqCst)?,
588+
this.atomic_op(args, dest, AtomicOp::Max, AtomicRwOp::SeqCst)?,
589589
"atomic_max_acq" =>
590-
this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::Acquire)?,
590+
this.atomic_op(args, dest, AtomicOp::Max, AtomicRwOp::Acquire)?,
591591
"atomic_max_rel" =>
592-
this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::Release)?,
592+
this.atomic_op(args, dest, AtomicOp::Max, AtomicRwOp::Release)?,
593593
"atomic_max_acqrel" =>
594-
this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::AcqRel)?,
594+
this.atomic_op(args, dest, AtomicOp::Max, AtomicRwOp::AcqRel)?,
595595
"atomic_max_relaxed" =>
596-
this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::Relaxed)?,
596+
this.atomic_op(args, dest, AtomicOp::Max, AtomicRwOp::Relaxed)?,
597597
"atomic_umin" =>
598-
this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::SeqCst)?,
598+
this.atomic_op(args, dest, AtomicOp::Min, AtomicRwOp::SeqCst)?,
599599
"atomic_umin_acq" =>
600-
this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::Acquire)?,
600+
this.atomic_op(args, dest, AtomicOp::Min, AtomicRwOp::Acquire)?,
601601
"atomic_umin_rel" =>
602-
this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::Release)?,
602+
this.atomic_op(args, dest, AtomicOp::Min, AtomicRwOp::Release)?,
603603
"atomic_umin_acqrel" =>
604-
this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::AcqRel)?,
604+
this.atomic_op(args, dest, AtomicOp::Min, AtomicRwOp::AcqRel)?,
605605
"atomic_umin_relaxed" =>
606-
this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::Relaxed)?,
606+
this.atomic_op(args, dest, AtomicOp::Min, AtomicRwOp::Relaxed)?,
607607
"atomic_umax" =>
608-
this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::SeqCst)?,
608+
this.atomic_op(args, dest, AtomicOp::Max, AtomicRwOp::SeqCst)?,
609609
"atomic_umax_acq" =>
610-
this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::Acquire)?,
610+
this.atomic_op(args, dest, AtomicOp::Max, AtomicRwOp::Acquire)?,
611611
"atomic_umax_rel" =>
612-
this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::Release)?,
612+
this.atomic_op(args, dest, AtomicOp::Max, AtomicRwOp::Release)?,
613613
"atomic_umax_acqrel" =>
614-
this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::AcqRel)?,
614+
this.atomic_op(args, dest, AtomicOp::Max, AtomicRwOp::AcqRel)?,
615615
"atomic_umax_relaxed" =>
616-
this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::Relaxed)?,
616+
this.atomic_op(args, dest, AtomicOp::Max, AtomicRwOp::Relaxed)?,
617617

618618
// Query type information
619619
"assert_zero_valid" | "assert_uninit_valid" => {
@@ -729,7 +729,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
729729
Ok(())
730730
}
731731

732-
fn atomic_op_min_max(
732+
fn atomic_op(
733733
&mut self,
734734
args: &[OpTy<'tcx, Tag>],
735735
dest: &PlaceTy<'tcx, Tag>,

0 commit comments

Comments
 (0)