Skip to content

Fix: Handle #pragma GCC target() in C++ bundler #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adamant-pwn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Handle #pragma GCC target() in C++ bundler #442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions onlinejudge_verify/languages/cplusplus_bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,17 @@ def _get_uncommented_code(path: pathlib.Path, *, iquotes_options: Tuple[str, ...
if compiler == 'g++':
raise BundleError(f'A fake g++ is detected. Please install the GNU C++ compiler.: {compiler}')
raise BundleError(f"It's not g++. Please specify g++ with $CXX envvar.: {compiler}")
command = [compiler, '-x', 'c++', *iquotes_options, '-fpreprocessed', '-dD', '-E', str(path)]
return subprocess.check_output(command)

# Comment out #pragma GCC target() before preprocessing to avoid GCC emitting extra macros
with open(str(path), 'rb') as f:
source = f.read()
source = re.sub(rb'^(\s*)#\s*pragma\s+GCC\s+target\s*\(', rb'\1/* OJ_BUNDLE_PRAGMA */ // #pragma GCC target(', source, flags=re.MULTILINE)

command = [compiler, '-x', 'c++', *iquotes_options, '-fpreprocessed', '-dD', '-E', '-']
result = subprocess.check_output(command, input=source)

# Uncomment pragmas in output
return re.sub(rb'^(\s*)/\*\s*OJ_BUNDLE_PRAGMA\s*\*/\s*//\s*#\s*pragma\s+GCC\s+target\s*\(', rb'\1#pragma GCC target(', result, flags=re.MULTILINE)


def get_uncommented_code(path: pathlib.Path, *, iquotes: List[pathlib.Path], compiler: str) -> bytes:
Expand Down