[all-commits] [llvm/llvm-project] a8bea0: Fix merge conflicts after syncing to head

[Snehasish Kumar via All-commits]

  Branch: refs/heads/users/snehasish/06-03-_memprof_split_memprofiler_into_instrumentation_and_use
  Home:   https://github.com/llvm/llvm-project
  Commit: a8bea0a08f099cb88f7596d8278d144c6ba65185
      https://github.com/llvm/llvm-project/commit/a8bea0a08f099cb88f7596d8278d144c6ba65185
  Author: Snehasish Kumar <snehasishk at google.com>
  Date:   2025-06-04 (Wed, 04 Jun 2025)

  Changed paths:
    R graphite_command_reference.md
    M llvm/lib/Transforms/Instrumentation/MemProfUse.cpp

  Log Message:
  -----------
  Fix merge conflicts after syncing to head

- Add missing extern declarations for MemProf command line options
- Remove duplicate function definition that conflicts with MemoryProfileInfo



To unsubscribe from these emails, change your notification settings at https://github.com/llvm/llvm-project/settings/notifications